chore: support Kubernetes v1.28.13 (#260)

Azure · Oct 10, 2024 · ca83d4a · ca83d4a
1 parent af9f998
commit ca83d4a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.github/policies/branch-protection.yml b/.github/policies/branch-protection.yml
@@ -69,7 +69,6 @@ configuration:
       # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
       requiredStatusChecks:
       - license/cla
-      - pr-e2e
       - GitOps/AdvancedSecurity
       # Require branches to be up to date before merging. boolean
       requiresStrictStatusChecks: false

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -363,7 +363,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.27.9":         false,
 	"1.27.10":        true,
 	"1.28.5":         false,
-	"1.28.6":         true,
+	"1.28.6":         false,
+	"1.28.13":        true,
 }
 
 // AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack
@@ -417,7 +418,8 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
 	"1.27.9":  false,
 	"1.27.10": true,
 	"1.28.5":  false,
-	"1.28.6":  true,
+	"1.28.6":  false,
+	"1.28.13": true,
 }
 
 // AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack
@@ -466,7 +468,8 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
 	"1.27.9":  false,
 	"1.27.10": true,
 	"1.28.5":  false,
-	"1.28.6":  true,
+	"1.28.6":  false,
+	"1.28.13": true,
 }
 
 // GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release

diff --git a/vhd/packer/configure-windows-vhd-phase2.ps1 b/vhd/packer/configure-windows-vhd-phase2.ps1
@@ -80,7 +80,7 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/csi-proxy/v1.1.3/binaries/csi-proxy-v1.1.3.tar.gz"
         );
         "c:\akse-cache\win-k8s\"      = @(
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.6/windowszip/v1.28.6-1int.zip",
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.27.10/windowszip/v1.27.10-1int.zip"
         );
         "c:\akse-cache\win-vnet-cni\" = @(

diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -125,7 +125,7 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/csi-proxy/v1.1.3/binaries/csi-proxy-v1.1.3.tar.gz"
         );
         "c:\akse-cache\win-k8s\"      = @(
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.6/windowszip/v1.28.6-1int.zip",
+            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.27.10/windowszip/v1.27.10-1int.zip"
         );
         "c:\akse-cache\win-vnet-cni\" = @(

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -202,7 +202,7 @@ loadContainerImage ${BUSYBOX_IMAGE}
 echo "  - ${BUSYBOX_IMAGE}" >> ${VHD_LOGS_FILEPATH}
 
 K8S_VERSIONS="
-1.28.6
+1.28.13
 1.27.10
 "
 for KUBERNETES_VERSION in ${K8S_VERSIONS}; do
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,7 +202,7 @@ loadContainerImage ${BUSYBOX_IMAGE} @@
     echo "  - ${BUSYBOX_IMAGE}" >> ${VHD_LOGS_FILEPATH}
     K8S_VERSIONS="
-.28.6
+.28.13
 .27.10
     "
     for KUBERNETES_VERSION in ${K8S_VERSIONS}; do
@@ Expand Down @@