Merge pull request kubeedge#247 from llhuii/fix-allinone

installation: allow *_VERSION passing without `v`
llhuii · Dec 2, 2021 · 5b0afad · 5b0afad
2 parents 3b9cef0 + 18020ea
commit 5b0afad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/installation/all-in-one.sh b/scripts/installation/all-in-one.sh
@@ -58,10 +58,14 @@ function prepare_env() {
   if [ -z "${KUBEEDGE_VERSION:-}" ]; then
     KUBEEDGE_VERSION=$(get_latest_version kubeedge/kubeedge $DEFAULT_KUBEEDGE_VERSION)
   fi
+  # 1.8.0 => v1.8.0
+  # v1.8.0 => v1.8.0
+  KUBEEDGE_VERSION=v${KUBEEDGE_VERSION#v}
 
   if [ -z "${SEDNA_VERSION:-}" ]; then
     SEDNA_VERSION=$(get_latest_version kubeedge/sedna $DEFAULT_SEDNA_VERSION)
   fi
+  SEDNA_VERSION=v${SEDNA_VERSION#v}
 
   : ${NUM_CLOUD_WORKER_NODES:=0}
   : ${NUM_EDGE_NODES:=1}
@@ -419,7 +423,7 @@ function install_sedna() {
   log_info "Installing Sedna Control Components..."
 
   run_in_control_plane bash -ec "
-    curl https://raw.githubusercontent.com/kubeedge/sedna/main/scripts/installation/install.sh | SEDNA_ACTION=create bash -
+    curl https://raw.githubusercontent.com/kubeedge/sedna/main/scripts/installation/install.sh | SEDNA_ACTION=create SEDNA_VERSION=$SEDNA_VERSION bash -
   "
 }
 

diff --git a/scripts/installation/install.sh b/scripts/installation/install.sh
@@ -48,6 +48,7 @@ get_latest_version() {
 }
 
 : ${SEDNA_VERSION:=$(get_latest_version)}
+SEDNA_VERSION=v${SEDNA_VERSION#v}
 
 _download_yamls() {