File tree 5 files changed +13
-7
lines changed
5 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ echo ""
63
63
if command -v tar & > /dev/null; then
64
64
rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf " ../${filename} "
65
65
66
- CLI_VERSION=" 0.1.10 "
66
+ CLI_VERSION=" 0.1.11 "
67
67
CLI_FILE=" terminus-cli-v${CLI_VERSION} _linux_${ARCH} .tar.gz"
68
68
if [ x" ${os_type} " == x" Darwin" ]; then
69
69
CLI_FILE=" terminus-cli-v${CLI_VERSION} _darwin_${ARCH} .tar.gz"
Original file line number Diff line number Diff line change @@ -1514,7 +1514,7 @@ install_containerd(){
1514
1514
}
1515
1515
1516
1516
install_k8s_ks () {
1517
- CLI_VERSION=0.1.10
1517
+ CLI_VERSION=0.1.11
1518
1518
ensure_success $sh_c " mkdir -p /etc/kke"
1519
1519
local cli_name=" terminus-cli-v${CLI_VERSION} _linux_${ARCH} .tar.gz"
1520
1520
if [ ! -f " ${BASE_DIR} /${cli_name} " ]; then
Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ log_fatal() {
129
129
130
130
install_cli (){
131
131
KUBE_TYPE=${KUBE_TYPE}
132
- CLI_VERSION=" 0.1.10 "
132
+ CLI_VERSION=" 0.1.11 "
133
133
if [ -z $KUBE_TYPE ]; then
134
134
KUBE_TYPE=" k3s"
135
135
fi
Original file line number Diff line number Diff line change @@ -71,9 +71,14 @@ log_info() {
71
71
}
72
72
73
73
remove_cluster (){
74
- CLI_VERSION=" 0.1.10 "
74
+ CLI_VERSION=" 0.1.11 "
75
75
forceUninstall=" ${FORCE_UNINSTALL_CLUSTER} "
76
76
forceDeleteCache=" false"
77
+
78
+ version=" ${TERMINUS_IS_CLOUD_VERSION} "
79
+ storage=" ${STORAGE} "
80
+ s3_bucket=" ${S3_BUCKET} "
81
+
77
82
log_info ' remove kubernetes cluster'
78
83
79
84
local cli_tar=" ${BASE_DIR} /terminus-cli-v${CLI_VERSION} _linux_${ARCH} .tar.gz"
@@ -96,8 +101,9 @@ remove_cluster(){
96
101
if [ ! -z " $forceUninstall " ]; then
97
102
forceDeleteCache=" true"
98
103
fi
99
-
100
- $sh_c " export DELETE_CACHE=${forceDeleteCache} && ${BASE_DIR} /terminus-cli terminus uninstall"
104
+
105
+
106
+ $sh_c " export DELETE_CACHE=${forceDeleteCache} && export TERMINUS_IS_CLOUD_VERSION=${version} && ${BASE_DIR} /terminus-cli terminus uninstall --delete-cri --storage-type=${storage} --storage-bucket=${s3_bucket} "
101
107
}
102
108
103
109
set -o pipefail
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ log_info() {
68
68
get_shell_exec
69
69
precheck_os
70
70
71
- CLI_VERSION=" 0.1.10 "
71
+ CLI_VERSION=" 0.1.11 "
72
72
CLI_FILENAME=" terminus-cli-v${CLI_VERSION} _darwin_${ARCH} .tar.gz"
73
73
CLI_URL=" https://github.com/beclab/Installer/releases/download/${CLI_VERSION} /terminus-cli-v${CLI_VERSION} _darwin_${ARCH} .tar.gz"
74
74
You can’t perform that action at this time.
0 commit comments