Don't hardcode

Author: willie-yao

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

@@ -88,14 +88,9 @@ spec:
       - content: |
           #!/bin/bash
 
-          set -o nounset
           set -o pipefail
           set -o errexit
 
-          export KUBEADM_REVISION="${KUBEADM_REVISION}"
-          export KUBECTL_REVISION="${KUBECTL_REVISION}"
-          export KUBELET_REVISION="${KUBELET_REVISION}"
-
           systemctl stop kubelet
 
           # Define the base URL and version
@@ -105,17 +100,31 @@ spec:
           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 arrays dynamically based on which *_REVISION variables are set
+          declare -a BINARIES=()
+          declare -A RPM_RELEASES=()
+
+          # Iterate through all environment variables ending with _REVISION
+          for VAR in $(compgen -e | grep '_REVISION$$'); do
+            # Extract binary name (e.g., KUBEADM_REVISION -> kubeadm)
+            BINARY_NAME=$${VAR%_REVISION}
+            BINARY=$${BINARY_NAME,,}  # Convert to lowercase
+            REVISION_VALUE=$${!VAR}
+
+            if [[ -n "$${REVISION_VALUE}" ]]; then
+              BINARIES+=("$${BINARY}")
+              RPM_RELEASES["$${BINARY}"]="$${REVISION_VALUE}.$${OS_VERSION}"
+              echo "Found revision variable: $${VAR}=$${REVISION_VALUE} -> will replace $${BINARY}"
+            fi
+          done
 
-          declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
-          declare -A RPM_RELEASES=(
-            ["kubeadm"]="$${KUBEADM_RPM_RELEASE}"
-            ["kubectl"]="$${KUBECTL_RPM_RELEASE}"
-            ["kubelet"]="$${KUBELET_RPM_RELEASE}"
-          )
+          # Get array length to avoid Jinja syntax conflicts
+          BINARY_COUNT=$${#BINARIES[@]}
+          if [[ $${BINARY_COUNT} -eq 0 ]]; then
+            echo "No *_REVISION variables set. Skipping binary replacement."
+            systemctl start kubelet
+            exit 0
+          fi
 
           for BINARY in "$${BINARIES[@]}"; do
             RPM_RELEASE="$${RPM_RELEASES[$${BINARY}]}"
@@ -150,9 +159,20 @@ spec:
 
           systemctl restart kubelet
 
-          echo "kubeadm version: $(kubeadm version -o=short)"
-          echo "kubectl version: $(kubectl version --client=true)"
-          echo "kubelet version: $(kubelet --version)"
+          # Print versions for binaries that were replaced
+          for BINARY in "$${BINARIES[@]}"; do
+            case "$${BINARY}" in
+              kubeadm)
+                echo "kubeadm version: $(kubeadm version -o=short)"
+                ;;
+              kubectl)
+                echo "kubectl version: $(kubectl version --client=true)"
+                ;;
+              kubelet)
+                echo "kubelet version: $(kubelet --version)"
+                ;;
+            esac
+          done
         path: /opt/install-custom-k8s-binaries.sh
         owner: "root:root"
         permissions: "0744"