diff --git a/kainstall-centos.sh b/kainstall-centos.sh index 34ebbef..b2f9f12 100755 --- a/kainstall-centos.sh +++ b/kainstall-centos.sh @@ -2474,8 +2474,8 @@ function add::network() { elif [[ "$KUBE_NETWORK" == "calico" ]]; then log::info "[network]" "add calico" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" command::exec "${MGMT_NODE}" " sed -i \"s#:v.*#:v${CALICO_VERSION}#g\" \"${OFFLINE_DIR}/manifests/calico.yaml\" @@ -2562,7 +2562,7 @@ function add::addon() { if [[ "$KUBE_ADDON" == "metrics-server" ]]; then log::info "[addon]" "download metrics-server manifests" local metrics_server_file="${OFFLINE_DIR}/manifests/metrics-server.yml" - utils::download_file "${GITHUB_PROXY}/https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" + utils::download_file "${GITHUB_PROXY}https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" command::exec "${MGMT_NODE}" " sed -i -e 's#k8s.gcr.io/metrics-server#$KUBE_IMAGE_REPO#g' \ diff --git a/kainstall-debian.sh b/kainstall-debian.sh index 84ba38b..4a0dec3 100755 --- a/kainstall-debian.sh +++ b/kainstall-debian.sh @@ -2461,8 +2461,8 @@ function add::network() { elif [[ "$KUBE_NETWORK" == "calico" ]]; then log::info "[network]" "add calico" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" command::exec "${MGMT_NODE}" " sed -i \"s#:v.*#:v${CALICO_VERSION}#g\" \"${OFFLINE_DIR}/manifests/calico.yaml\" @@ -2549,7 +2549,7 @@ function add::addon() { if [[ "$KUBE_ADDON" == "metrics-server" ]]; then log::info "[addon]" "download metrics-server manifests" local metrics_server_file="${OFFLINE_DIR}/manifests/metrics-server.yml" - utils::download_file "${GITHUB_PROXY}/https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" + utils::download_file "${GITHUB_PROXY}https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" command::exec "${MGMT_NODE}" " sed -i -e 's#k8s.gcr.io/metrics-server#$KUBE_IMAGE_REPO#g' \ diff --git a/kainstall-ubuntu.sh b/kainstall-ubuntu.sh index 9299be2..c3ec086 100755 --- a/kainstall-ubuntu.sh +++ b/kainstall-ubuntu.sh @@ -2462,8 +2462,8 @@ function add::network() { elif [[ "$KUBE_NETWORK" == "calico" ]]; then log::info "[network]" "add calico" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" - utils::download_file "https://docs.projectcalico.org/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calico.yaml" "${OFFLINE_DIR}/manifests/calico.yaml" + utils::download_file "https://projectcalico.docs.tigera.io/archive/v${CALICO_VERSION%.*}/manifests/calicoctl.yaml" "${OFFLINE_DIR}/manifests/calicoctl.yaml" command::exec "${MGMT_NODE}" " sed -i \"s#:v.*#:v${CALICO_VERSION}#g\" \"${OFFLINE_DIR}/manifests/calico.yaml\" @@ -2550,7 +2550,7 @@ function add::addon() { if [[ "$KUBE_ADDON" == "metrics-server" ]]; then log::info "[addon]" "download metrics-server manifests" local metrics_server_file="${OFFLINE_DIR}/manifests/metrics-server.yml" - utils::download_file "${GITHUB_PROXY}/https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" + utils::download_file "${GITHUB_PROXY}https://github.com/kubernetes-sigs/metrics-server/releases/download/v${METRICS_SERVER_VERSION}/components.yaml" "${metrics_server_file}" command::exec "${MGMT_NODE}" " sed -i -e 's#k8s.gcr.io/metrics-server#$KUBE_IMAGE_REPO#g' \