Skip to content

Commit 1b60161

Browse files
fjz99fjz99
committed
fix makefile
Signed-off-by: fjz <1358925318@qq.com>
1 parent 59178f5 commit 1b60161

File tree

7 files changed

+63
-56
lines changed

7 files changed

+63
-56
lines changed

‎Makefile

+6-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build clean
22

3-
export BLADE_VERSION=1.6.1
3+
export BLADE_VERSION=1.7.0
44

55
ALLOWGITVERSION=1.8.5
66
GITVERSION:=$(shell git --version | grep ^git | sed 's/^.* //g')
@@ -17,13 +17,12 @@ GO_ENV=CGO_ENABLED=1
1717
GO_MODULE=GO111MODULE=on
1818
VERSION_PKG=github.com/chaosblade-io/chaosblade/version
1919
# Specify chaosblade version in docker experiments
20-
DOCKER_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-docker/version
2120
CRI_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-cri/version
2221
OS_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-os/version
2322
JVM_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-jvm/version
24-
K8S_BLADE_VERSION=github.com/chaosblade-io/cchaosblade-operator/version
23+
K8S_BLADE_VERSION=github.com/chaosblade-io/chaosblade-operator/version
2524

26-
GO_X_FLAGS=-X ${VERSION_PKG}.Ver=$(BLADE_VERSION) -X '${VERSION_PKG}.Env=`uname -mv`' -X '${VERSION_PKG}.BuildTime=`date`' -X ${DOCKER_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${CRI_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${OS_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${JVM_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${K8S_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION)
25+
GO_X_FLAGS=-X ${VERSION_PKG}.Ver=$(BLADE_VERSION) -X '${VERSION_PKG}.Env=`uname -mv`' -X '${VERSION_PKG}.BuildTime=`date`' -X ${CRI_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${OS_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${JVM_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${K8S_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION)
2726
GO_FLAGS=-ldflags="$(GO_X_FLAGS) -s -w"
2827
GO=env $(GO_ENV) $(GO_MODULE) go
2928

@@ -53,10 +52,6 @@ BLADE_EXEC_OS_BRANCH=master
5352
BLADE_EXEC_MIDDLEWARE_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-middleware.git
5453
BLADE_EXEC_MIDDLEWARE_BRANCH=main
5554

56-
# chaosblade-exec-docker
57-
BLADE_EXEC_DOCKER_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-docker.git
58-
BLADE_EXEC_DOCKER_BRANCH=v1.5.0
59-
6055
# chaosblade-exec-cri
6156
BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
6257
BLADE_EXEC_CRI_BRANCH=main
@@ -73,17 +68,13 @@ BLADE_EXEC_JVM_BRANCH=master
7368
BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
7469
BLADE_EXEC_CPLUS_BRANCH=master
7570

76-
# docker yaml
77-
DOCKER_YAML_FILE_NAME=chaosblade-docker-spec-$(BLADE_VERSION).yaml
78-
DOCKER_YAML_FILE_PATH=$(BUILD_TARGET_BIN)/$(DOCKER_YAML_FILE_NAME)
79-
8071
# cri yaml
8172
CRI_YAML_FILE_NAME=chaosblade-cri-spec-$(BLADE_VERSION).yaml
8273
CRI_YAML_FILE_PATH=$(BUILD_TARGET_BIN)/$(CRI_YAML_FILE_NAME)
8374

8475
# check yaml
8576
CHECK_YAML_FILE_NAME=chaosblade-check-spec-$(BLADE_VERSION).yaml
86-
CHECK_YANL_FILE_OSS=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/agent/github/$(BLADE_VERSION)/$(CHECK_YAML_FILE_NAME)
77+
CHECK_YANL_FILE_OSS=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/agent/github/chaosblade-check-spec.yaml
8778
CHECK_YAML_FILE_PATH=$(BUILD_TARGET_YAML)/$(CHECK_YAML_FILE_NAME)
8879

8980
ifeq ($(GOOS), linux)
@@ -110,10 +101,10 @@ build_with_linux_arm: pre_build build_linux_arm_with_arg ## Select scenario buil
110101

111102
# build chaosblade linux version by docker image
112103
build_linux: ## Build linux version of all scenarios by docker image
113-
make build_with_linux ARGS="cli os middleware docker cri nsexec kubernetes java cplus check_yaml" upx package
104+
make build_with_linux ARGS="cli os middleware cri nsexec kubernetes java cplus check_yaml" upx package
114105

115106
build_linux_arm: ## Build linux arm version of all scenarios by docker image
116-
make build_with_linux_arm ARGS="cli os middleware docker cri nsexec kubernetes java cplus check_yaml" upx package
107+
make build_with_linux_arm ARGS="cli os middleware cri nsexec kubernetes java cplus check_yaml" upx package
117108

118109
build_darwin: pre_build cli os middleware cri cplus java kubernetes upx package check_yaml ## Build all scenarios darwin version
119110

@@ -158,15 +149,6 @@ endif
158149
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-middleware/$(BUILD_TARGET_BIN)/* $(BUILD_TARGET_BIN)
159150
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-middleware/$(BUILD_TARGET_YAML)/* $(BUILD_TARGET_YAML)
160151

161-
docker: ## Build docker experimental scenarios.
162-
ifneq ($(BUILD_TARGET_CACHE)/chaosblade-exec-docker, $(wildcard $(BUILD_TARGET_CACHE)/chaosblade-exec-docker))
163-
git clone -b $(BLADE_EXEC_DOCKER_BRANCH) $(BLADE_EXEC_DOCKER_PROJECT) $(BUILD_TARGET_CACHE)/chaosblade-exec-docker
164-
else
165-
git -C $(BUILD_TARGET_CACHE)/chaosblade-exec-docker pull origin $(BLADE_EXEC_DOCKER_BRANCH)
166-
endif
167-
make -C $(BUILD_TARGET_CACHE)/chaosblade-exec-docker
168-
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-docker/$(BUILD_TARGET_YAML)/* $(BUILD_TARGET_YAML)
169-
170152
kubernetes: ## Build kubernetes experimental scenarios.
171153
ifneq ($(BUILD_TARGET_CACHE)/chaosblade-operator, $(wildcard $(BUILD_TARGET_CACHE)/chaosblade-operator))
172154
git clone -b $(BLADE_OPERATOR_BRANCH) $(BLADE_OPERATOR_PROJECT) $(BUILD_TARGET_CACHE)/chaosblade-operator

‎build/spec/spec.go

+43-17
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ import (
2222
"os"
2323
"path"
2424

25+
"github.com/chaosblade-io/chaosblade-exec-cri/exec"
2526
"github.com/chaosblade-io/chaosblade-spec-go/spec"
2627
"github.com/chaosblade-io/chaosblade-spec-go/util"
28+
29+
"github.com/chaosblade-io/chaosblade/cli/cmd"
2730
)
2831

29-
var version = "0.7.1"
32+
var version = "1.7.0"
3033

3134
func main() {
3235

@@ -38,19 +41,17 @@ func main() {
3841
jvmSpecFile := path.Join(filePath, fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version))
3942
osSpecFile := path.Join(filePath, fmt.Sprintf("chaosblade-os-spec-%s.yaml", version))
4043
k8sSpecFile := path.Join(filePath, fmt.Sprintf("chaosblade-k8s-spec-%s.yaml", version))
41-
dockerSpecFile := path.Join(filePath, fmt.Sprintf("chaosblade-docker-spec-%s.yaml", version))
4244
criSpecFile := path.Join(filePath, fmt.Sprintf("chaosblade-cri-spec-%s.yaml", version))
4345
cplusSpecFile := path.Join(filePath, "chaosblade-cplus-spec.yaml")
4446
chaosSpecFile := path.Join(targetPath, "chaosblade.spec.yaml")
4547

4648
osModels := getOsModels(osSpecFile)
4749
jvmModels := getJvmModels(jvmSpecFile)
4850
cplusModels := getCplusModels(cplusSpecFile)
49-
dockerModels := getDockerModels(dockerSpecFile)
50-
criModels := getCriModels(criSpecFile)
51-
k8sModels := getKubernetesModels(k8sSpecFile)
51+
criModels := getCriModels(criSpecFile, jvmSpecFile)
52+
k8sModels := getKubernetesModels(k8sSpecFile, jvmSpecFile)
5253

53-
models := mergeModels(osModels, jvmModels, dockerModels, cplusModels, criModels, k8sModels)
54+
models := mergeModels(osModels, jvmModels, cplusModels, criModels, k8sModels)
5455

5556
file, err := os.OpenFile(chaosSpecFile, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0755)
5657
if err != nil {
@@ -83,30 +84,55 @@ func getCplusModels(cplusSpecFile string) *spec.Models {
8384
return models
8485
}
8586

86-
func getDockerModels(dockerSpecFile string) *spec.Models {
87-
models, err := util.ParseSpecsToModel(dockerSpecFile, nil)
87+
func getCriModels(criSpecFile, jvmSpecFile string) *spec.Models {
88+
criModels, err := util.ParseSpecsToModel(criSpecFile, nil)
8889
if err != nil {
89-
log.Fatalf("parse docker spec failed, %s", err)
90+
log.Fatalf("parse cri spec failed, %s", err)
9091
}
91-
return models
92-
}
9392

94-
func getCriModels(criSpecFile string) *spec.Models {
95-
models, err := util.ParseSpecsToModel(criSpecFile, nil)
96-
if err != nil {
97-
log.Fatalf("parse cri spec failed, %s", err)
93+
jvmModels := getJvmModels(jvmSpecFile)
94+
for idx := range jvmModels.Models {
95+
model := &jvmModels.Models[idx]
96+
model.ExpScope = "cri"
97+
spec.AddFlagsToModelSpec(exec.GetExecInContainerFlags, model)
98+
addFlagToActionSpec(model)
99+
criModels.Models = append(criModels.Models, *model)
98100
}
99-
return models
101+
102+
return criModels
100103
}
101104

102-
func getKubernetesModels(k8sSpecFile string) *spec.Models {
105+
func getKubernetesModels(k8sSpecFile, jvmSpecFile string) *spec.Models {
103106
models, err := util.ParseSpecsToModel(k8sSpecFile, nil)
104107
if err != nil {
105108
log.Fatalf("parse kubernetes spec failed, %s", err)
106109
}
110+
111+
jvmModels := getJvmModels(jvmSpecFile)
112+
for idx := range jvmModels.Models {
113+
model := &jvmModels.Models[idx]
114+
115+
model.ExpScope = "container"
116+
spec.AddFlagsToModelSpec(cmd.GetResourceFlags, model)
117+
addFlagToActionSpec(model)
118+
models.Models = append(models.Models, *model)
119+
}
107120
return models
108121
}
109122

123+
func addFlagToActionSpec(model *spec.ExpCommandModel) {
124+
for idx := range model.ExpActions {
125+
action := &model.ExpActions[idx]
126+
flags := model.ExpFlags
127+
if flags == nil {
128+
flags = make([]spec.ExpFlag, 0)
129+
}
130+
action.ActionFlags = append(action.ActionFlags, flags...)
131+
//model.ExpActions[idx] = *action
132+
}
133+
model.SetFlags(nil)
134+
}
135+
110136
func convertSpecToModels(modelSpec spec.ExpModelCommandSpec, prepare spec.ExpPrepareModel) *spec.Models {
111137
models := &spec.Models{
112138
Version: "v1",

‎cli/cmd/exp.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func (ec *baseExpCommandService) registerDockerExpCommands() []*modelCommand {
232232
return modelCommands
233233
}
234234

235-
func getResourceFlags() []spec.ExpFlagSpec {
235+
func GetResourceFlags() []spec.ExpFlagSpec {
236236
coverageFlags := model.GetResourceCoverageFlags()
237237
commonFlags := model.GetResourceCommonFlags()
238238
containerFlags := model.GetContainerFlags()
@@ -263,7 +263,7 @@ func (ec *baseExpCommandService) registerK8sExpCommands() []*modelCommand {
263263
for idx := range models.Models {
264264
model := &models.Models[idx]
265265
model.ExpScope = "container"
266-
spec.AddFlagsToModelSpec(getResourceFlags, model)
266+
spec.AddFlagsToModelSpec(GetResourceFlags, model)
267267
command := ec.registerExpCommand(model, k8sSpec.Name())
268268
modelCommands = append(modelCommands, command)
269269
}

‎cli/cmd/prepare_cplus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (pc *PrepareCPlusCommand) prepareCPlus() error {
6363
return spec.ResponseFailWithFlags(spec.DatabaseError, "query", err)
6464
}
6565
if record == nil || record.Status != Running {
66-
record, err = insertPrepareRecord(PrepareCPlusType, portStr, portStr, "")
66+
record, err = insertPrepareRecord(PrepareCPlusType, pc.Name(), portStr, "")
6767
if err != nil {
6868
log.Errorf(ctx, util.GetRunFuncName(), spec.DatabaseError.Sprintf("insert", err))
6969
return spec.ResponseFailWithFlags(spec.DatabaseError, "insert", err)

‎exec/kubernetes/executor_compose.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func NewComposeExecutor() ComposeExecutor {
4141
}
4242

4343
func (*ComposeExecutorForK8s) Name() string {
44-
return "os"
44+
return "k8s"
4545
}
4646

4747
func (e *ComposeExecutorForK8s) Exec(uid string, ctx context.Context, model *spec.ExpModel) *spec.Response {

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/chaosblade-io/chaosblade
33
go 1.13
44

55
require (
6-
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983
7-
github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31
8-
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd
9-
github.com/chaosblade-io/chaosblade-spec-go v1.6.0
6+
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0
7+
github.com/chaosblade-io/chaosblade-exec-os v1.7.0
8+
github.com/chaosblade-io/chaosblade-operator v1.7.0
9+
github.com/chaosblade-io/chaosblade-spec-go v1.7.0
1010
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
1111
github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3
1212
github.com/shirou/gopsutil v3.21.8-0.20210816101416-f86a04298073+incompatible

‎go.sum

+6-7
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9
119119
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
120120
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
121121
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
122-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220715204823-f1df3164ca2c h1:4KdBasbkBGsTPOIaD1Mr2IL4b1ifSbW29IF7WPrnBNY=
123-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220715204823-f1df3164ca2c/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
124122
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
125123
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
126124
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -166,11 +164,12 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
166164
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
167165
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
168166
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
169-
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
170-
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983 h1:cdztcdV7ZGbQ6Jkm3Ek6hUB7HqKYK8U6B28ZUxamwck=
171-
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
172-
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd h1:dxp0Qo7ounoxnhjH/aVmztpr8haoIolv3Z9DwRqJU2A=
173-
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
167+
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0 h1:TOqA0UZS317dISb3nTwGR1Dlyr0HqsrwT5buamjZ20I=
168+
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0/go.mod h1:ka3BMJWLJd18DXt8no68WcYD8oVuhN5GeCyDf8uFK3s=
169+
github.com/chaosblade-io/chaosblade-exec-os v1.7.0 h1:Y0V4a2LqGwVxqvVORGkXS6Y9xx1CuTWhihneGmrdAAY=
170+
github.com/chaosblade-io/chaosblade-exec-os v1.7.0/go.mod h1:e8TuopYAESkl5ZgSjfnDL03KwO09tmA1H6Y8oPNZElw=
171+
github.com/chaosblade-io/chaosblade-operator v1.7.0 h1:MBSsDTvisePhhtKzP9F7eTy4O2qvS4PghCQmPAggaT0=
172+
github.com/chaosblade-io/chaosblade-operator v1.7.0/go.mod h1:XLB6bqrHuuhmY8kRyF0b55+jwgCgJwI3w+oIMfY5mHc=
174173
github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
175174
github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
176175
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=

0 commit comments

Comments
 (0)