From 323b8ef5f4761fe3e34cdca31d1c575b329e64af Mon Sep 17 00:00:00 2001 From: jadarsie Date: Fri, 14 Aug 2020 09:10:20 -0700 Subject: [PATCH] feat: add support for K8s v1.17.11 on Azure Stack --- pkg/api/common/versions.go | 6 +++++- vhd/packer/configure-windows-vhd.ps1 | 3 ++- vhd/packer/install-dependencies.sh | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index fe752a9e4a5..cf19ecd2c4e 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -187,8 +187,10 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.17.5": false, "1.17.6": false, "1.17.7": false, - "1.17.8": true, + "1.17.8": false, "1.17.9": true, + "1.17.10": false, // replaced by 1.17.11 due to k8s release engineering issues + "1.17.11": true, "1.18.0-alpha.1": false, "1.18.0-alpha.2": false, "1.18.0-alpha.3": false, @@ -230,6 +232,7 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{ "1.17.6": false, "1.17.7": false, "1.17.9": true, + "1.17.11": true, } // AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack @@ -246,6 +249,7 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{ "1.17.6": false, "1.17.7": false, "1.17.9": true, + "1.17.11": 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 0d1497300f3..e5cae0d0641 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -87,11 +87,11 @@ function Get-FilesToCacheOnVHD ); "c:\akse-cache\win-k8s\" = @( - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.10-azs/windowszip/v1.15.10-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.11-azs/windowszip/v1.15.11-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.12-azs/windowszip/v1.15.12-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.16.13-azs/windowszip/v1.16.13-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.9-azs/windowszip/v1.17.9-azs-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.11-azs/windowszip/v1.17.11-azs-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.10/windowszip/v1.15.10-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.11/windowszip/v1.15.11-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.15.11-hotfix.20200714/windowszip/v1.15.11-hotfix.20200714-1int.zip", @@ -108,6 +108,7 @@ function Get-FilesToCacheOnVHD "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.8/windowszip/v1.17.8-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.9/windowszip/v1.17.9-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.9-hotfix.20200714/windowszip/v1.17.9-hotfix.20200714-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.11/windowszip/v1.17.11-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.4/windowszip/v1.18.4-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.4-hotfix.20200624/windowszip/v1.18.4-hotfix.20200624-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.5/windowszip/v1.18.5-1int.zip", diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index 252d2f5c16b..80455a5d671 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -363,6 +363,8 @@ K8S_VERSIONS=" 1.19.0-rc.4 1.18.6 1.18.5 +1.17.11 +1.17.11-azs 1.17.9 1.17.9-azs 1.17.8