Skip to content

Commit 6d290d7

Browse files
committed
Chore: Fix issue template and change compilation branch to master
Signed-off-by: xcaspar <changjun.xcj@alibaba-inc.com>
1 parent 97957b1 commit 6d290d7

4 files changed

Lines changed: 9 additions & 57 deletions

File tree

File renamed without changes.

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,35 +72,35 @@ BUILD_TARGET_CACHE=$(BUILD_TARGET)/cache
7272

7373
# chaosblade-exec-os
7474
BLADE_EXEC_OS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-os.git
75-
BLADE_EXEC_OS_BRANCH=v1.7.5
75+
BLADE_EXEC_OS_BRANCH=master
7676

7777
# chaosblade-exec-middleware
7878
BLADE_EXEC_MIDDLEWARE_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-middleware.git
79-
BLADE_EXEC_MIDDLEWARE_BRANCH=v1.7.5
79+
BLADE_EXEC_MIDDLEWARE_BRANCH=main
8080

8181
# chaosblade-exec-cloud
8282
BLADE_EXEC_CLOUD_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cloud.git
83-
BLADE_EXEC_CLOUD_BRANCH=v1.7.5
83+
BLADE_EXEC_CLOUD_BRANCH=main
8484

8585
# chaosblade-exec-cri
8686
BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
87-
BLADE_EXEC_CRI_BRANCH=v1.7.5
87+
BLADE_EXEC_CRI_BRANCH=main
8888

8989
# chaosblade-exec-kubernetes
9090
BLADE_OPERATOR_PROJECT=https://github.com/chaosblade-io/chaosblade-operator.git
91-
BLADE_OPERATOR_BRANCH=v1.7.5
91+
BLADE_OPERATOR_BRANCH=master
9292

9393
# chaosblade-exec-jvm
9494
BLADE_EXEC_JVM_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-jvm.git
95-
BLADE_EXEC_JVM_BRANCH=v1.7.5
95+
BLADE_EXEC_JVM_BRANCH=master
9696

9797
# chaosblade-exec-cplus
9898
BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
9999
BLADE_EXEC_CPLUS_BRANCH=master
100100

101101
# chaosblade-spec-go
102102
BLADE_SPEC_GO_PROJECT=https://github.com/chaosblade-io/chaosblade-spec-go.git
103-
BLADE_SPEC_GO_BRANCH=v1.7.5
103+
BLADE_SPEC_GO_BRANCH=master
104104

105105
# cri yaml
106106
CRI_YAML_FILE_NAME=chaosblade-cri-spec-$(BLADE_VERSION).yaml

README.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,7 @@ After entering the container, you can read the README.txt file to implement the
6262
[chaosblade-operator](https://github.com/chaosblade-io/chaosblade-operator) The project is a chaos experiment injection tool for cloud-native platforms. It follows the chaos experiment model to standardize the experimental scenario and defines the experiment as Kubernetes CRD Resources, mapping experimental models to Kubernetes resource attributes, and very friendly combination of chaotic experimental models with Kubernetes declarative design. While relying on chaotic experimental models to conveniently develop scenarios, it can also well integrate Kubernetes design concepts, through kubectl or Write code to directly call the Kubernetes API to create, update, and delete chaotic experiments, and the resource status can clearly indicate the execution status of the experiment, and standardize Kubernetes fault injection. In addition to using the above methods to perform experiments, you can also use the chaosblade cli method to execute kubernetes experimental scenarios and query the experimental status very conveniently. For details, please read the chinese document: [Chaos Engineering Practice under Cloud Native](CLOUDNATIVE.md)
6363

6464
## Compile
65-
This project is written in golang, so you need to install the latest golang version first. The minimum supported version is 1.11. After the Clone project, enter the project directory and execute the following command to compile:
66-
```shell script
67-
make
68-
```
69-
If on a mac system, compile the current system version, execute:
70-
```shell script
71-
make build_darwin
72-
```
73-
If you want to compile linux system version on mac system, execute:
74-
```shell script
75-
make build_linux
76-
```
77-
You can also compile selectively, for example, you only need to compile cli and os scenes, then execute:
78-
```shell script
79-
make build_with cli os
80-
# If it is a mac system, run
81-
make build_with cli os_darwin
82-
# If you want to compile linux system version selectively, execute:
83-
ARGS="cli os" make build_with_linux
84-
```
85-
86-
Arch Linux install [chaosblade-bin](https://aur.archlinux.org/packages/chaosblade-bin/)
87-
```bash
88-
yay -S chaosblade-bin
89-
```
65+
See [BUILD.md](BUILD.md) for the details.
9066

9167
## Bugs and Feedback
9268
For bug report, questions and discussions please submit [GitHub Issues](https://github.com/chaosblade-io/chaosblade/issues).

README_CN.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,7 @@ docker run -it --privileged chaosbladeio/chaosblade-demo
6262
[chaosblade-operator](https://github.com/chaosblade-io/chaosblade-operator) 项目是针对云原生平台所实现的混沌实验注入工具,遵循混沌实验模型规范化实验场景,把实验定义为 Kubernetes CRD 资源,将实验模型映射为 Kubernetes 资源属性,很友好地将混沌实验模型与 Kubernetes 声明式设计结合在一起,在依靠混沌实验模型便捷开发场景的同时,又可以很好的结合 Kubernetes 设计理念,通过 kubectl 或者编写代码直接调用 Kubernetes API 来创建、更新、删除混沌实验,而且资源状态可以非常清晰地表示实验的执行状态,标准化实现 Kubernetes 故障注入。除了使用上述方式执行实验外,还可以使用 chaosblade cli 方式非常方便的执行 kubernetes 实验场景,查询实验状态等。具体请阅读:[云原生下的混沌工程实践](CLOUDNATIVE.md)
6363

6464
## 编译
65-
此项目采用 golang 语言编写,所以需要先安装最新的 golang 版本,最低支持的版本是 1.11。Clone 工程后进入项目目录执行以下命令进行编译:
66-
```shell script
67-
make
68-
```
69-
如果在 mac 系统上,编译当前系统的版本,请执行:
70-
```shell script
71-
make build_darwin
72-
```
73-
如果想在 mac 系统上,编译 linux 系统版本,请执行:
74-
```shell script
75-
make build_linux
76-
```
77-
也可以选择性编译,比如只需要编译 cli、os 场景,则执行:
78-
```shell script
79-
make build_with cli os
80-
# 如果是 mac 系统,执行
81-
make build_with cli os_darwin
82-
# 如果是 mac 系统,想选择性的编译 linux 版本的 cli,os,则执行:
83-
ARGS="cli os" make build_with_linux
84-
```
85-
86-
Arch Linux 安装 [chaosblade-bin](https://aur.archlinux.org/packages/chaosblade-bin/)
87-
```bash
88-
yay -S chaosblade-bin
89-
```
65+
详见 [BUILD_ZH.md](BUILD_ZH.md)
9066

9167
## 缺陷&建议
9268
欢迎提交缺陷、问题、建议和新功能,所有项目(包含其他子项目)的问题都可以提交到[Github Issues](https://github.com/chaosblade-io/chaosblade/issues)

0 commit comments

Comments
 (0)