Skip to content

Commit

Permalink
update chaosblade module version to v1.4.0
Browse files Browse the repository at this point in the history
Signed-off-by: xcaspar <[email protected]>
  • Loading branch information
xcaspar committed Dec 1, 2021
1 parent 3573c34 commit bd00997
Show file tree
Hide file tree
Showing 4 changed files with 487 additions and 16 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build clean

export BLADE_VERSION=1.3.0
export BLADE_VERSION=1.4.0

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

# chaosblade-exec-os
BLADE_EXEC_OS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-os.git
BLADE_EXEC_OS_BRANCH=v1.3.0
BLADE_EXEC_OS_BRANCH=v1.4.0

# chaosblade-exec-docker
BLADE_EXEC_DOCKER_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-docker.git
BLADE_EXEC_DOCKER_BRANCH=v1.3.0
BLADE_EXEC_DOCKER_BRANCH=v1.4.0

# chaosblade-exec-cri
BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
BLADE_EXEC_CRI_BRANCH=v1.3.0
BLADE_EXEC_CRI_BRANCH=v1.4.0

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

# chaosblade-exec-jvm
BLADE_EXEC_JVM_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-jvm.git
BLADE_EXEC_JVM_BRANCH=v1.3.0
BLADE_EXEC_JVM_BRANCH=v1.4.0

# chaosblade-exec-cplus
BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
BLADE_EXEC_CPLUS_BRANCH=master
BLADE_EXEC_CPLUS_BRANCH=v1.4.0

# docker yaml
DOCKER_YAML_FILE_NAME=chaosblade-docker-spec-$(BLADE_VERSION).yaml
Expand Down
7 changes: 6 additions & 1 deletion cli/cmd/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,10 @@ func (dc *DestroyCommand) actionPostRunEFunc(actionCommand *actionCommand) func(
}

func destroyExample() string {
return `blade destroy 47cc0744f1bb`
return `
# Destroy experiment
blade destroy 47cc0744f1bb
# Force delete kubernetes experiment
blade destroy 47cc0744f1bb --target k8s --kubeconfig ~/.kube/config --force-remove`
}
17 changes: 9 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@ module github.com/chaosblade-io/chaosblade
go 1.13

require (
github.com/chaosblade-io/chaosblade-exec-docker v1.3.1-0.20210906073714-7bd7d7367d76
github.com/chaosblade-io/chaosblade-exec-os v1.3.1-0.20210906070659-0b8e3c15c25b
github.com/chaosblade-io/chaosblade-operator v1.3.1-0.20210906074054-831b748528b9
github.com/chaosblade-io/chaosblade-spec-go v1.3.1-0.20210906070321-ae22844733f2
github.com/chaosblade-io/chaosblade-exec-cri v1.4.0
github.com/chaosblade-io/chaosblade-exec-docker v1.4.0
github.com/chaosblade-io/chaosblade-exec-os v1.4.0
github.com/chaosblade-io/chaosblade-operator v1.4.0
github.com/chaosblade-io/chaosblade-spec-go v1.4.0
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3
github.com/shirou/gopsutil v3.21.6+incompatible
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v0.0.5
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
k8s.io/apimachinery v0.17.4
k8s.io/apimachinery v0.20.6
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.5.3
sigs.k8s.io/controller-runtime v0.6.0
)

replace k8s.io/client-go => k8s.io/client-go v0.17.4
replace k8s.io/client-go => k8s.io/client-go v0.20.6
Loading

0 comments on commit bd00997

Please sign in to comment.