Merge pull request #986 from bzsuni/update/install-calico

Update the script for install-calico
spidernet-io · Nov 17, 2023 · d29fe3a · d29fe3a
2 parents 96910f3 + 823151f
commit d29fe3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4,741 deletions.
diff --git a/test/scripts/installCalico.sh b/test/scripts/installCalico.sh
@@ -10,31 +10,29 @@ OS=$(uname | tr 'A-Z' 'a-z')
 SED_COMMAND="sed"
 if [ ${OS} == "darwin" ]; then SED_COMMAND=gsed ; fi
 
-CURRENT_FILENAME=$( basename $0 )
 CURRENT_DIR_PATH=$(cd $(dirname $0); pwd)
 PROJECT_ROOT_PATH=$( cd ${CURRENT_DIR_PATH}/../.. && pwd )
 
-DEST_CALICO_YAML_DIR=${PROJECT_ROOT_PATH}/test/.tmp/yaml
+DEST_CALICO_YAML_DIR=${PROJECT_ROOT_PATH}/test/.tmp
 rm -rf ${DEST_CALICO_YAML_DIR}
 mkdir -p ${DEST_CALICO_YAML_DIR}
-cp ${PROJECT_ROOT_PATH}/test/yaml/calico.yaml ${DEST_CALICO_YAML_DIR}/calico.yaml
 
 CALICO_YAML=${DEST_CALICO_YAML_DIR}/calico.yaml
 CALICO_CONFIG=${DEST_CALICO_YAML_DIR}/calico_config.yaml
 CALICO_NODE=${DEST_CALICO_YAML_DIR}/calico_node.yaml
 
 # CALICO_VERSION
 if [ -z "${CALICO_VERSION}" ]; then
-  [ -n "${HTTP_PROXY}" ] && calico_tag=$(curl --retry 3 -x "${HTTP_PROXY}" -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name')
-  [ -z "${HTTP_PROXY}" ] && calico_tag=$(curl --retry 3 -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name')
+  [ -n "${HTTP_PROXY}" ] && calico_tag=$(curl --retry 3 --retry-delay 5 -x "${HTTP_PROXY}" -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name')
+  [ -z "${HTTP_PROXY}" ] && calico_tag=$(curl --retry 3 --retry-delay 5 -s https://api.github.com/repos/projectcalico/calico/releases/latest | jq -r '.tag_name')
   [ "${calico_tag}" == "null" ] && { echo "failed get calico version"; exit 1; }
 else
   calico_tag=${CALICO_VERSION}
 fi
 echo "install calico version ${calico_tag}"
 
-[ -n "${HTTP_PROXY}" ] && curl --retry 3 -x "${HTTP_PROXY}" -Lo ${CALICO_YAML}  https://raw.githubusercontent.com/projectcalico/calico/${calico_tag}/manifests/calico.yaml
-[ -z "${HTTP_PROXY}" ] && curl --retry 3 -Lo ${CALICO_YAML}  https://raw.githubusercontent.com/projectcalico/calico/${calico_tag}/manifests/calico.yaml
+[ -n "${HTTP_PROXY}" ] && curl --retry 3 --retry-delay 5 -x "${HTTP_PROXY}" -Lo ${CALICO_YAML}  https://raw.githubusercontent.com/projectcalico/calico/${calico_tag}/manifests/calico.yaml
+[ -z "${HTTP_PROXY}" ] && curl --retry 3 --retry-delay 5 -Lo ${CALICO_YAML}  https://raw.githubusercontent.com/projectcalico/calico/${calico_tag}/manifests/calico.yaml
 
 # set registry
 if [ -n "${CALICO_REGISTRY}" ]; then
@@ -135,3 +133,5 @@ kubectl -n kube-system delete pod -l k8s-app=calico-kube-controllers --force --g
 sleep 3
 kubectl wait --for=condition=ready -l k8s-app=calico-kube-controllers --timeout=${INSTALL_TIME_OUT} pod -n kube-system
 
+rm -rf ${DEST_CALICO_YAML_DIR}
+