From f15f186bab02bc516239f282707ca9100d130078 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 | 2 ++ vhd/packer/configure-windows-vhd.ps1 | 2 +- vhd/packer/install-dependencies.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index a7ceb1a6d0..6ba4bf2b1d 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -235,6 +235,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 @@ -251,6 +252,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 96cf207f46..08568a2a15 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", diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index cc2b12c749..2a843d3bce 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -368,6 +368,7 @@ K8S_VERSIONS=" 1.18.8 1.18.6 1.17.11 +1.17.11-azs 1.17.9 1.17.9-azs 1.16.14