From b69326c373b876650a11a061bf9b9cb23cd5f4c2 Mon Sep 17 00:00:00 2001
From: jadarsie <jadarsie@microsoft.com>
Date: Tue, 29 Nov 2022 14:32:55 -0800
Subject: [PATCH] chore: enable v1.23.14 & v1.22.16 on Azure Stack Hub

---
 pkg/api/common/versions.go           | 12 ++++++++----
 vhd/packer/configure-windows-vhd.ps1 |  2 --
 vhd/packer/install-dependencies.sh   |  2 --
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
index af5f26103a..1d63e26917 100644
--- a/pkg/api/common/versions.go
+++ b/pkg/api/common/versions.go
@@ -384,10 +384,12 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
 	"1.20.11": false,
 	"1.21.10": false,
 	"1.22.7":  false,
-	"1.22.15": true,
+	"1.22.15": false,
+	"1.22.16": true,
 	"1.23.6":  false,
 	"1.23.12": false,
-	"1.23.13": true,
+	"1.23.13": false,
+	"1.23.14": true,
 }
 
 // AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack
@@ -417,10 +419,12 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
 	"1.20.11": false,
 	"1.21.10": false,
 	"1.22.7":  false,
-	"1.22.15": true,
+	"1.22.15": false,
+	"1.22.16": true,
 	"1.23.6":  false,
 	"1.23.12": false,
-	"1.23.13": true,
+	"1.23.13": false,
+	"1.23.14": true,
 }
 
 // GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
index 85a68ce67c..2f49d28c36 100644
--- a/vhd/packer/configure-windows-vhd.ps1
+++ b/vhd/packer/configure-windows-vhd.ps1
@@ -124,9 +124,7 @@ function Get-FilesToCacheOnVHD {
         );
         "c:\akse-cache\win-k8s\"      = @(
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.14/windowszip/v1.21.14-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.22.7/windowszip/v1.22.7-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.22.16/windowszip/v1.22.16-1int.zip",
-            "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.6/windowszip/v1.23.6-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.23.14/windowszip/v1.23.14-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.24.8/windowszip/v1.24.8-1int.zip"
         );
diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
index 5b1f880bd8..fa631d9bc1 100644
--- a/vhd/packer/install-dependencies.sh
+++ b/vhd/packer/install-dependencies.sh
@@ -221,9 +221,7 @@ echo "  - busybox" >> ${VHD_LOGS_FILEPATH}
 K8S_VERSIONS="
 1.24.8
 1.23.14
-1.23.6
 1.22.16
-1.22.7
 1.21.14
 "
 for KUBERNETES_VERSION in ${K8S_VERSIONS}; do