Skip to content

Commit 20a8ea6

Browse files
authored
fix: remove s3 mount (#323)
1 parent 44d8670 commit 20a8ea6

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

Diff for: build/installer/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ echo ""
6363
if command -v tar &>/dev/null; then
6464
rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf "../${filename}"
6565

66-
CLI_VERSION="0.1.10"
66+
CLI_VERSION="0.1.11"
6767
CLI_FILE="terminus-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
6868
if [ x"${os_type}" == x"Darwin" ]; then
6969
CLI_FILE="terminus-cli-v${CLI_VERSION}_darwin_${ARCH}.tar.gz"

Diff for: build/installer/install_cmd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ install_containerd(){
15141514
}
15151515
15161516
install_k8s_ks() {
1517-
CLI_VERSION=0.1.10
1517+
CLI_VERSION=0.1.11
15181518
ensure_success $sh_c "mkdir -p /etc/kke"
15191519
local cli_name="terminus-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
15201520
if [ ! -f "${BASE_DIR}/${cli_name}" ]; then

Diff for: build/installer/install_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ log_fatal() {
129129

130130
install_cli(){
131131
KUBE_TYPE=${KUBE_TYPE}
132-
CLI_VERSION="0.1.10"
132+
CLI_VERSION="0.1.11"
133133
if [ -z $KUBE_TYPE ]; then
134134
KUBE_TYPE="k3s"
135135
fi

Diff for: build/installer/uninstall_cmd.sh

+9-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,14 @@ log_info() {
7171
}
7272

7373
remove_cluster(){
74-
CLI_VERSION="0.1.10"
74+
CLI_VERSION="0.1.11"
7575
forceUninstall="${FORCE_UNINSTALL_CLUSTER}"
7676
forceDeleteCache="false"
77+
78+
version="${TERMINUS_IS_CLOUD_VERSION}"
79+
storage="${STORAGE}"
80+
s3_bucket="${S3_BUCKET}"
81+
7782
log_info 'remove kubernetes cluster'
7883

7984
local cli_tar="${BASE_DIR}/terminus-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
@@ -96,8 +101,9 @@ remove_cluster(){
96101
if [ ! -z "$forceUninstall" ]; then
97102
forceDeleteCache="true"
98103
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}"
101107
}
102108

103109
set -o pipefail

Diff for: build/installer/uninstall_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ log_info() {
6868
get_shell_exec
6969
precheck_os
7070

71-
CLI_VERSION="0.1.10"
71+
CLI_VERSION="0.1.11"
7272
CLI_FILENAME="terminus-cli-v${CLI_VERSION}_darwin_${ARCH}.tar.gz"
7373
CLI_URL="https://github.com/beclab/Installer/releases/download/${CLI_VERSION}/terminus-cli-v${CLI_VERSION}_darwin_${ARCH}.tar.gz"
7474

0 commit comments

Comments
 (0)