Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/api/k8s_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -918,8 +918,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.31.7",
common.CloudNodeManagerAddonName: "oss/kubernetes/azure-cloud-node-manager:v1.31.6",
common.CloudControllerManagerComponentName: "oss/kubernetes/azure-cloud-controller-manager:v1.31.1",
common.CloudNodeManagerAddonName: "oss/kubernetes/azure-cloud-node-manager:v1.31.1",
common.WindowsArtifactComponentName: "v" + version + "/windowszip/v" + version + "-1int.zip",
common.WindowsArtifactAzureStackComponentName: "v" + version + "/windowszip/v" + version + "-1int.zip",
common.DashboardAddonName: dashboardImageReference,
Expand Down Expand Up @@ -1001,8 +1001,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.30.13",
common.CloudNodeManagerAddonName: "oss/kubernetes/azure-cloud-node-manager:v1.30.12",
common.CloudControllerManagerComponentName: "oss/kubernetes/azure-cloud-controller-manager:v1.30.7",
common.CloudNodeManagerAddonName: "oss/kubernetes/azure-cloud-node-manager:v1.30.8",
common.WindowsArtifactComponentName: "v" + version + "/windowszip/v" + version + "-1int.zip",
common.WindowsArtifactAzureStackComponentName: "v" + version + "/windowszip/v" + version + "-1int.zip",
common.DashboardAddonName: dashboardImageReference,
Expand Down
4 changes: 2 additions & 2 deletions vhd/packer/configure-windows-vhd-phase2.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ function Get-ContainerImages {
"mcr.microsoft.com/windows/servercore:ltsc2019",
"mcr.microsoft.com/windows/nanoserver:1809",
"mcr.microsoft.com/oss/kubernetes/pause:3.8",
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.12",
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.31.6",
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.30.8",
"mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.31.1",
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.12",
"mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.12-windows-hp",
"mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0",
Expand Down
8 changes: 4 additions & 4 deletions vhd/packer/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ done

# Starting with 1.16 we pull cloud-controller-manager and cloud-node-manager
CLOUD_CONTROLLER_MANAGER_VERSIONS="
1.31.7
1.30.13
1.31.1
1.30.7
"
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}"
Expand All @@ -237,8 +237,8 @@ done

# Starting with 1.16 we pull cloud-controller-manager and cloud-node-manager
CLOUD_NODE_MANAGER_VERSIONS="
1.31.6
1.30.12
1.31.1
1.30.8
"
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}"
Expand Down