chore: update version

Signed-off-by: tiny-x <[email protected]>

Author: tiny-x

Makefile

@@ -44,23 +44,23 @@ 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=1.6.0-dev
+BLADE_EXEC_OS_BRANCH=master
 
 # chaosblade-exec-docker
 BLADE_EXEC_DOCKER_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-docker.git
 BLADE_EXEC_DOCKER_BRANCH=v1.5.0
 
 # chaosblade-exec-cri
 BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
-BLADE_EXEC_CRI_BRANCH=1.6.0-dev
+BLADE_EXEC_CRI_BRANCH=main
 
 # chaosblade-exec-kubernetes
 BLADE_OPERATOR_PROJECT=https://github.com/chaosblade-io/chaosblade-operator.git
-BLADE_OPERATOR_BRANCH=1.6.0-dev
+BLADE_OPERATOR_BRANCH=master
 
 # chaosblade-exec-jvm
 BLADE_EXEC_JVM_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-jvm.git
-BLADE_EXEC_JVM_BRANCH=1.6.0-dev
+BLADE_EXEC_JVM_BRANCH=master
 
 # chaosblade-exec-cplus
 BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
@@ -122,8 +122,8 @@ pre_build: mkdir_build_target ## Mkdir build target
 cli: ## Build blade cli
 	$(GO) build $(GO_FLAGS) -o $(BUILD_TARGET_PKG_DIR)/blade ./cli
 
-nsexec: ## Build nsexec
-	musl-gcc -static nsexec.c -o $(BUILD_TARGET_PKG_DIR)/bin/nsexec
+nsexec: ## Build nsexecgo
+	/usr/local/musl/bin/musl-gcc -static nsexec.c -o $(BUILD_TARGET_PKG_DIR)/bin/nsexec
 
 os: ## Build basic resource experimental scenarios.
 ifneq ($(BUILD_TARGET_CACHE)/chaosblade-exec-os, $(wildcard $(BUILD_TARGET_CACHE)/chaosblade-exec-os))

go.mod

@@ -3,10 +3,10 @@ module github.com/chaosblade-io/chaosblade
 go 1.13
 
 require (
-	github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e
-	github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4
-	github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc
-	github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300
+	github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983
+	github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31
+	github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd
+	github.com/chaosblade-io/chaosblade-spec-go v1.6.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.8-0.20210816101416-f86a04298073+incompatible

go.sum

@@ -166,12 +166,20 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e h1:ZF05b4HKrg3vKe6b0QI9UxtebZ3M8ZS3fNW/A7/z598=
 github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
+github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983 h1:cdztcdV7ZGbQ6Jkm3Ek6hUB7HqKYK8U6B28ZUxamwck=
+github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
 github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4 h1:L1S4syQy85xfC+Yb7S88DIkdYrRyJV1Rqq5GfBYwbKg=
 github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4/go.mod h1:UNDuSGNygBqqGVxUMhCL56BwK/up53bz8qKVOdEEyFE=
+github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31 h1:QCCKsDQJEikN+MhNXbLjz4hBmR1Ldvphz5Hy548YGiI=
+github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31/go.mod h1:UNDuSGNygBqqGVxUMhCL56BwK/up53bz8qKVOdEEyFE=
 github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc h1:flvATfoh6jsf8vViEyIJkwmhJHfgJV6OzUdbY/Gm9e4=
 github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
+github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd h1:dxp0Qo7ounoxnhjH/aVmztpr8haoIolv3Z9DwRqJU2A=
+github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
 github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300 h1:zHZkTkuMHbeSOZ/vXYgo+0p/qFfLaXQdwKyAFh75hyA=
 github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
+github.com/chaosblade-io/chaosblade-spec-go v1.6.0 h1:IF77oiLJzJhZc/hT71TMscneXKCrcjv8WEAQhl+scs8=
+github.com/chaosblade-io/chaosblade-spec-go v1.6.0/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=