Further dalec spec fixes

Author: willie-yao

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

@@ -92,9 +92,11 @@ spec:
           set -o pipefail
           set -o errexit
 
-          systemctl stop kubelet
+          export KUBEADM_REVISION="${KUBEADM_REVISION}"
+          export KUBECTL_REVISION="${KUBECTL_REVISION}"
+          export KUBELET_REVISION="${KUBELET_REVISION}"
 
-          declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
+          systemctl stop kubelet
 
           # Define the base URL and version
           BASE_URL="https://kubernetesreleases.blob.core.windows.net/dalec-packages"
@@ -103,12 +105,23 @@ 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}"
+
+          declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
+          declare -A RPM_RELEASES=(
+            ["kubeadm"]="$${KUBEADM_RPM_RELEASE}"
+            ["kubectl"]="$${KUBECTL_RPM_RELEASE}"
+            ["kubelet"]="$${KUBELET_RPM_RELEASE}"
+          )
+
           for BINARY in "$${BINARIES[@]}"; do
-            echo "* downloading and extracting binary: $${BINARY} $${VERSION}"
-            BINARY_VAR="$${BINARY^^}_REVISION"
-            REVISION=$${!BINARY_VAR}
-            RPM_FILE="/tmp/$${BINARY}-$${VERSION}-$${REVISION}.$${OS_VERSION}.$${ARCH}.rpm"
-            RPM_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}-$${VERSION}-$${REVISION}.$${OS_VERSION}.$${ARCH}.rpm"
+            RPM_RELEASE="$${RPM_RELEASES[$${BINARY}]}"
+            echo "* downloading and extracting binary: $${BINARY} $${VERSION} with rpm release $${RPM_RELEASE}"
+            RPM_FILE="/tmp/$${BINARY}-$${VERSION}-$${RPM_RELEASE}.$${ARCH}.rpm"
+            RPM_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}-$${VERSION}-$${RPM_RELEASE}.$${ARCH}.rpm"
 
             echo "Downloading from: $${RPM_URL}"
             curl -L --retry 10 --retry-delay 5 "$${RPM_URL}" --output "$${RPM_FILE}"

templates/test/ci/prow-dalec-custom-builds/patches/azl3-machine-deployment.yaml

@@ -6,17 +6,33 @@
       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
-      declare -a BINARIES=("kubeadm" "kubectl" "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="ubuntu24.04"
       ARCH="amd64"
+
+      # Construct DEB_VERSION explicitly for each binary
+      KUBEADM_DEB_VERSION="$${OS_VERSION}u$${KUBEADM_REVISION}"
+      KUBECTL_DEB_VERSION="$${OS_VERSION}u$${KUBECTL_REVISION}"
+      KUBELET_DEB_VERSION="$${OS_VERSION}u$${KUBELET_REVISION}"
+
+      declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
+      declare -A DEB_VERSIONS=(
+        ["kubeadm"]="$${KUBEADM_DEB_VERSION}"
+        ["kubectl"]="$${KUBECTL_DEB_VERSION}"
+        ["kubelet"]="$${KUBELET_DEB_VERSION}"
+      )
+
       for BINARY in "$${BINARIES[@]}"; do
-        BINARY_VAR="$${BINARY^^}_REVISION"
-        DEB_VERSION=$${!BINARY_VAR}
+        DEB_VERSION="$${DEB_VERSIONS[$${BINARY}]}"
         echo "* downloading and extracting binary: $${BINARY} $${VERSION} with deb version $${DEB_VERSION}"
         DEB_FILE="/tmp/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"
         DEB_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"
@@ -40,4 +56,8 @@
   path: /spec/kubeadmConfigSpec/preKubeadmCommands/-
   value:
     bash -c /tmp/replace-k8s-binaries.sh
+- op: add
+  path: /spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/ignorePreflightErrors
+  value:
+    - HTTPProxyCIDR
 

templates/test/ci/prow-dalec-custom-builds/patches/control-plane-custom-builds.yaml

@@ -6,17 +6,33 @@
       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
-      declare -a BINARIES=("kubeadm" "kubectl" "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="ubuntu24.04"
       ARCH="amd64"
+
+      # Construct DEB_VERSION explicitly for each binary
+      KUBEADM_DEB_VERSION="$${OS_VERSION}u$${KUBEADM_REVISION}"
+      KUBECTL_DEB_VERSION="$${OS_VERSION}u$${KUBECTL_REVISION}"
+      KUBELET_DEB_VERSION="$${OS_VERSION}u$${KUBELET_REVISION}"
+
+      declare -a BINARIES=("kubeadm" "kubectl" "kubelet")
+      declare -A DEB_VERSIONS=(
+        ["kubeadm"]="$${KUBEADM_DEB_VERSION}"
+        ["kubectl"]="$${KUBECTL_DEB_VERSION}"
+        ["kubelet"]="$${KUBELET_DEB_VERSION}"
+      )
+
       for BINARY in "$${BINARIES[@]}"; do
-        BINARY_VAR="$${BINARY^^}_REVISION"
-        DEB_VERSION=$${!BINARY_VAR}
+        DEB_VERSION="$${DEB_VERSIONS[$${BINARY}]}"
         echo "* downloading and extracting binary: $${BINARY} $${VERSION} with deb version $${DEB_VERSION}"
         DEB_FILE="/tmp/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"
         DEB_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"