chore: support cloud controller manager v1.27.9 and cloud node manage…

…r v1.27.4 https://github.com/kubernetes-sigs/cloud-provider-azure#aks-version-matrix
Azure · Oct 9, 2023 · 925f1fd · 925f1fd
1 parent e38424a
commit 925f1fd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go
@@ -791,8 +791,8 @@ func getK8sVersionComponents(version, kubernetesImageBaseType string, overrides
 			common.ControllerManagerComponentName:             getDefaultImage(common.ControllerManagerComponentName, kubernetesImageBaseType) + ":v" + version,
 			common.KubeProxyAddonName:                         getDefaultImage(common.KubeProxyAddonName, kubernetesImageBaseType) + ":v" + version,
 			common.SchedulerComponentName:                     getDefaultImage(common.SchedulerComponentName, kubernetesImageBaseType) + ":v" + version,
-			common.CloudControllerManagerComponentName:        "oss/kubernetes/azure-cloud-controller-manager:v1.26.10",
-			common.CloudNodeManagerAddonName:                  "oss/kubernetes/azure-cloud-node-manager:v1.26.10",
+			common.CloudControllerManagerComponentName:        "oss/kubernetes/azure-cloud-controller-manager:v1.27.9",
+			common.CloudNodeManagerAddonName:                  "oss/kubernetes/azure-cloud-node-manager:v1.27.4",
 			common.WindowsArtifactComponentName:               "v" + version + "/windowszip/v" + version + "-1int.zip",
 			common.WindowsArtifactAzureStackComponentName:     "v" + version + "/windowszip/v" + version + "-1int.zip",
 			common.DashboardAddonName:                         dashboardImageReference,

diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -50,8 +50,8 @@ function Get-ContainerImages {
                 "mcr.microsoft.com/oss/kubernetes/pause:1.4.1",
                 "mcr.microsoft.com/oss/kubernetes/pause:3.4.1",
                 "mcr.microsoft.com/oss/kubernetes/pause:3.8",
-                "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.25.9",
                 "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.26.10",
+                "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.27.4",
                 "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.10.0",
                 "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.10.0-windows-hp",
                 "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.26.5",

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -224,16 +224,25 @@ for KUBERNETES_VERSION in ${K8S_VERSIONS}; do
 done
 
 # Starting with 1.16 we pull cloud-controller-manager and cloud-node-manager
-CLOUD_MANAGER_VERSIONS="
+CLOUD_CONTROLLER_MANAGER_VERSIONS="
+1.27.9
 1.26.10
-1.25.9
 "
-for CLOUD_MANAGER_VERSION in ${CLOUD_MANAGER_VERSIONS}; do
-  for COMPONENT in azure-cloud-controller-manager azure-cloud-node-manager; do
-    CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/${COMPONENT}:v${CLOUD_MANAGER_VERSION}"
-    loadContainerImage ${CONTAINER_IMAGE}
-    echo "  - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
-  done
+for CLOUD_CONTROLLER_MANAGER_VERSION in ${CLOUD_CONTROLLER_MANAGER_VERSIONS}; do
+  CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v${CLOUD_CONTROLLER_MANAGER_VERSION}"
+  loadContainerImage ${CONTAINER_IMAGE}
+  echo "  - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
+done
+
+# Starting with 1.16 we pull cloud-controller-manager and cloud-node-manager
+CLOUD_NODE_MANAGER_VERSIONS="
+1.27.4
+1.26.10
+"
+for CLOUD_NODE_MANAGER_VERSION in ${CLOUD_NODE_MANAGER_VERSIONS}; do
+  CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v${CLOUD_NODE_MANAGER_VERSION}"
+  loadContainerImage ${CONTAINER_IMAGE}
+  echo "  - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
 done
 
 AZUREDISK_CSI_VERSIONS="