From 67cb304d6cb75013712fb4282c20a30d4f133776 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Thu, 14 Jan 2021 07:20:23 -0700 Subject: [PATCH 1/2] feat: add support for Kubernetes v1.19.7 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.19.md#changelog-since-v1196 --- pkg/api/common/versions.go | 3 ++- vhd/packer/configure-windows-vhd.ps1 | 2 +- vhd/packer/install-dependencies.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index cb784fe475..59671b2263 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -231,8 +231,9 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.19.2": false, "1.19.3": false, "1.19.4": false, - "1.19.5": true, + "1.19.5": false, "1.19.6": true, + "1.19.7": true, "1.20.0-alpha.1": false, "1.20.0-alpha.2": false, "1.20.0-alpha.3": false, diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index 1e8501c86f..87f73c91dd 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -118,9 +118,9 @@ function Get-FilesToCacheOnVHD { "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.12/windowszip/v1.18.12-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.13/windowszip/v1.18.13-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14/windowszip/v1.18.14-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.4/windowszip/v1.19.4-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.5/windowszip/v1.19.5-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6/windowszip/v1.19.6-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6/windowszip/v1.19.7-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.0/windowszip/v1.20.0-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.1/windowszip/v1.20.1-1int.zip" ); diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index 8e19ff67f7..de18d80468 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -369,8 +369,8 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" 1.20.1 1.20.0 +1.19.7 1.19.6 -1.19.5 1.18.14 1.18.13 1.18.10-azs From 25c56e39da755b9a12b19f81e78a40ee52fdd8c2 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Thu, 14 Jan 2021 09:14:08 -0700 Subject: [PATCH 2/2] fix: typo in Windows archive URL --- vhd/packer/configure-windows-vhd.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index 87f73c91dd..bebbd1d813 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -120,7 +120,7 @@ function Get-FilesToCacheOnVHD { "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14/windowszip/v1.18.14-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.5/windowszip/v1.19.5-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6/windowszip/v1.19.6-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6/windowszip/v1.19.7-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7/windowszip/v1.19.7-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.0/windowszip/v1.20.0-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.1/windowszip/v1.20.1-1int.zip" );