fix azl3

Author: willie-yao

templates/test/ci/cluster-template-prow-dalec-custom-builds.yaml

@@ -92,30 +92,34 @@ spec:
           set -o pipefail
           set -o errexit
 
-          export KUBEADM_REVISION="${KUBEADM_REVISION}"
-          export KUBECTL_REVISION="${KUBECTL_REVISION}"
-          export KUBELET_REVISION="${KUBELET_REVISION}"
+          export KUBEADM_REVISION="${KUBEADM_REVISION:-}"
+          export KUBECTL_REVISION="${KUBECTL_REVISION:-}"
+          export KUBELET_REVISION="${KUBELET_REVISION:-}"
 
           systemctl stop kubelet
 
-          # Define the base URL and version
           BASE_URL="https://kubernetesreleases.blob.core.windows.net/dalec-packages"
           VERSION="${KUBERNETES_VERSION}"
           VERSION=$${VERSION#v}
           OS_VERSION="azl3"
           ARCH="x86_64"
 
-          # Construct RPM_RELEASE explicitly for each binary
-          KUBEADM_RPM_RELEASE="$${KUBEADM_REVISION}.$${OS_VERSION}"
-          KUBECTL_RPM_RELEASE="$${KUBECTL_REVISION}.$${OS_VERSION}"
-          KUBELET_RPM_RELEASE="$${KUBELET_REVISION}.$${OS_VERSION}"
+          # Build lists of binaries to replace based on what's set
+          declare -a BINARIES=()
+          declare -A RPM_RELEASES=()
 
-          declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
-          declare -A RPM_RELEASES=(
-            ["kubeadm"]="$${KUBEADM_RPM_RELEASE}"
-            ["kubectl"]="$${KUBECTL_RPM_RELEASE}"
-            ["kubelet"]="$${KUBELET_RPM_RELEASE}"
-          )
+          [[ -n "${KUBEADM_REVISION}" ]] && BINARIES+=("kubeadm") && RPM_RELEASES["kubeadm"]="$${KUBEADM_REVISION}.$${OS_VERSION}"
+          [[ -n "${KUBECTL_REVISION}" ]] && BINARIES+=("kubectl") && RPM_RELEASES["kubectl"]="$${KUBECTL_REVISION}.$${OS_VERSION}"
+          [[ -n "${KUBELET_REVISION}" ]] && BINARIES+=("kubelet") && RPM_RELEASES["kubelet"]="$${KUBELET_REVISION}.$${OS_VERSION}"
+
+          # Skip if nothing to replace (check first element)
+          if [[ -z "$${BINARIES[0]:-}" ]]; then
+            echo "No *_REVISION variables set. Skipping binary replacement."
+            systemctl start kubelet
+            exit 0
+          fi
+
+          echo "Replacing binaries: $${BINARIES[*]}"
 
           for BINARY in "$${BINARIES[@]}"; do
             RPM_RELEASE="$${RPM_RELEASES[$${BINARY}]}"
@@ -126,14 +130,12 @@ spec:
             echo "Downloading from: $${RPM_URL}"
             curl -L --retry 10 --retry-delay 5 "$${RPM_URL}" --output "$${RPM_FILE}"
 
-            # Extract binary from RPM package in a temporary directory
             echo "Extracting $${BINARY} binary to /usr/bin"
             TEMP_DIR="/tmp/$${BINARY}-extract-$$"
             mkdir -p "$${TEMP_DIR}"
             cd "$${TEMP_DIR}"
             rpm2cpio "$${RPM_FILE}" | cpio -idmv
 
-            # Move the binary to the correct location
             if [ -f "./usr/bin/$${BINARY}" ]; then
               mv "./usr/bin/$${BINARY}" "/usr/bin/$${BINARY}"
               chmod +x "/usr/bin/$${BINARY}"
@@ -142,17 +144,17 @@ spec:
               exit 1
             fi
 
-            # Clean up
             cd /
             rm -rf "$${TEMP_DIR}"
             rm -f "$${RPM_FILE}"
           done
 
           systemctl restart kubelet
 
-          echo "kubeadm version: $(kubeadm version -o=short)"
-          echo "kubectl version: $(kubectl version --client=true)"
-          echo "kubelet version: $(kubelet --version)"
+          # Print versions
+          [[ " $${BINARIES[*]} " =~ " kubeadm " ]] && echo "kubeadm version: $(kubeadm version -o=short)"
+          [[ " $${BINARIES[*]} " =~ " kubectl " ]] && echo "kubectl version: $(kubectl version --client=true)"
+          [[ " $${BINARIES[*]} " =~ " kubelet " ]] && echo "kubelet version: $(kubelet --version)"
         path: /opt/install-custom-k8s-binaries.sh
         owner: "root:root"
         permissions: "0744"