Skip to content

Commit bd00997

Browse files
committed
update chaosblade module version to v1.4.0
Signed-off-by: xcaspar <changjun.xcj@alibaba-inc.com>
1 parent 3573c34 commit bd00997

File tree

4 files changed

+487
-16
lines changed

4 files changed

+487
-16
lines changed

Makefile

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

3-
export BLADE_VERSION=1.3.0
3+
export BLADE_VERSION=1.4.0
44

55
ALLOWGITVERSION=1.8.5
66
GITVERSION:=$(shell git --version | grep ^git | sed 's/^.* //g')
@@ -43,27 +43,27 @@ BUILD_TARGET_CACHE=$(BUILD_TARGET)/cache
4343

4444
# chaosblade-exec-os
4545
BLADE_EXEC_OS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-os.git
46-
BLADE_EXEC_OS_BRANCH=v1.3.0
46+
BLADE_EXEC_OS_BRANCH=v1.4.0
4747

4848
# chaosblade-exec-docker
4949
BLADE_EXEC_DOCKER_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-docker.git
50-
BLADE_EXEC_DOCKER_BRANCH=v1.3.0
50+
BLADE_EXEC_DOCKER_BRANCH=v1.4.0
5151

5252
# chaosblade-exec-cri
5353
BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
54-
BLADE_EXEC_CRI_BRANCH=v1.3.0
54+
BLADE_EXEC_CRI_BRANCH=v1.4.0
5555

5656
# chaosblade-exec-kubernetes
5757
BLADE_OPERATOR_PROJECT=https://github.com/chaosblade-io/chaosblade-operator.git
58-
BLADE_OPERATOR_BRANCH=v1.3.0
58+
BLADE_OPERATOR_BRANCH=v1.4.0
5959

6060
# chaosblade-exec-jvm
6161
BLADE_EXEC_JVM_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-jvm.git
62-
BLADE_EXEC_JVM_BRANCH=v1.3.0
62+
BLADE_EXEC_JVM_BRANCH=v1.4.0
6363

6464
# chaosblade-exec-cplus
6565
BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
66-
BLADE_EXEC_CPLUS_BRANCH=master
66+
BLADE_EXEC_CPLUS_BRANCH=v1.4.0
6767

6868
# docker yaml
6969
DOCKER_YAML_FILE_NAME=chaosblade-docker-spec-$(BLADE_VERSION).yaml

cli/cmd/destroy.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -350,5 +350,10 @@ func (dc *DestroyCommand) actionPostRunEFunc(actionCommand *actionCommand) func(
350350
}
351351

352352
func destroyExample() string {
353-
return `blade destroy 47cc0744f1bb`
353+
return `
354+
# Destroy experiment
355+
blade destroy 47cc0744f1bb
356+
357+
# Force delete kubernetes experiment
358+
blade destroy 47cc0744f1bb --target k8s --kubeconfig ~/.kube/config --force-remove`
354359
}

go.mod

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ module github.com/chaosblade-io/chaosblade
33
go 1.13
44

55
require (
6-
github.com/chaosblade-io/chaosblade-exec-docker v1.3.1-0.20210906073714-7bd7d7367d76
7-
github.com/chaosblade-io/chaosblade-exec-os v1.3.1-0.20210906070659-0b8e3c15c25b
8-
github.com/chaosblade-io/chaosblade-operator v1.3.1-0.20210906074054-831b748528b9
9-
github.com/chaosblade-io/chaosblade-spec-go v1.3.1-0.20210906070321-ae22844733f2
6+
github.com/chaosblade-io/chaosblade-exec-cri v1.4.0
7+
github.com/chaosblade-io/chaosblade-exec-docker v1.4.0
8+
github.com/chaosblade-io/chaosblade-exec-os v1.4.0
9+
github.com/chaosblade-io/chaosblade-operator v1.4.0
10+
github.com/chaosblade-io/chaosblade-spec-go v1.4.0
1011
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
1112
github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3
1213
github.com/shirou/gopsutil v3.21.6+incompatible
1314
github.com/sirupsen/logrus v1.8.1
14-
github.com/spf13/cobra v0.0.5
15+
github.com/spf13/cobra v1.0.0
1516
github.com/spf13/pflag v1.0.5
1617
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
17-
k8s.io/apimachinery v0.17.4
18+
k8s.io/apimachinery v0.20.6
1819
k8s.io/client-go v12.0.0+incompatible
19-
sigs.k8s.io/controller-runtime v0.5.3
20+
sigs.k8s.io/controller-runtime v0.6.0
2021
)
2122

22-
replace k8s.io/client-go => k8s.io/client-go v0.17.4
23+
replace k8s.io/client-go => k8s.io/client-go v0.20.6

0 commit comments

Comments
 (0)