From d03ae6e2aa3b6475a2dedd2976eb03f406d84f49 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 11 Aug 2020 09:53:50 -0600 Subject: [PATCH 1/2] feat: add support for Kubernetes 1.18.7 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md#changelog-since-v1186 --- pkg/api/common/versions.go | 3 ++- pkg/api/vlabs/validate_test.go | 4 ++-- vhd/packer/configure-windows-vhd.ps1 | 3 +-- vhd/packer/install-dependencies.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 4fe7a1e327..9808e41045 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -200,8 +200,9 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.18.2": false, "1.18.3": false, "1.18.4": false, - "1.18.5": true, + "1.18.5": false, "1.18.6": true, + "1.18.7": true, "1.19.0-alpha.1": true, "1.19.0-alpha.2": true, "1.19.0-alpha.3": true, diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go index 3bee6c41a5..a6edcbc3a9 100644 --- a/pkg/api/vlabs/validate_test.go +++ b/pkg/api/vlabs/validate_test.go @@ -178,7 +178,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) { properties: &Properties{ OrchestratorProfile: &OrchestratorProfile{ OrchestratorType: "Kubernetes", - OrchestratorVersion: "1.18.5", + OrchestratorVersion: "1.18.7", KubernetesConfig: &KubernetesConfig{ LoadBalancerSku: BasicLoadBalancerSku, ExcludeMasterFromStandardLB: to.BoolPtr(true), @@ -192,7 +192,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) { properties: &Properties{ OrchestratorProfile: &OrchestratorProfile{ OrchestratorType: "Kubernetes", - OrchestratorVersion: "1.18.5", + OrchestratorVersion: "1.18.7", KubernetesConfig: &KubernetesConfig{ LoadBalancerOutboundIPs: to.IntPtr(17), }, diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index 151315709d..bc5d987927 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -107,10 +107,9 @@ 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.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", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.6/windowszip/v1.18.6-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.7/windowszip/v1.18.7-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.0-rc.4/windowszip/v1.19.0-rc.4-1int.zip" ); "c:\akse-cache\win-vnet-cni\" = @( diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index c6294afb22..804dbaa882 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -365,8 +365,8 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" 1.19.0-rc.4 +1.18.7 1.18.6 -1.18.5 1.17.9 1.17.9-azs 1.17.8 From 3f818c5a292e98901379e67e6034490790ddef13 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Thu, 13 Aug 2020 12:12:52 -0600 Subject: [PATCH 2/2] fix: 1.18.8 replaces 1.18.7, which should not be used --- pkg/api/common/versions.go | 3 ++- pkg/api/vlabs/validate_test.go | 4 ++-- vhd/packer/configure-windows-vhd.ps1 | 2 +- vhd/packer/install-dependencies.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 9808e41045..158df7a608 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -202,7 +202,8 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.18.4": false, "1.18.5": false, "1.18.6": true, - "1.18.7": true, + "1.18.7": false, // replaced by 1.18.8 due to k8s release engineering issues + "1.18.8": true, "1.19.0-alpha.1": true, "1.19.0-alpha.2": true, "1.19.0-alpha.3": true, diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go index a6edcbc3a9..bbe7ae860c 100644 --- a/pkg/api/vlabs/validate_test.go +++ b/pkg/api/vlabs/validate_test.go @@ -178,7 +178,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) { properties: &Properties{ OrchestratorProfile: &OrchestratorProfile{ OrchestratorType: "Kubernetes", - OrchestratorVersion: "1.18.7", + OrchestratorVersion: "1.18.8", KubernetesConfig: &KubernetesConfig{ LoadBalancerSku: BasicLoadBalancerSku, ExcludeMasterFromStandardLB: to.BoolPtr(true), @@ -192,7 +192,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) { properties: &Properties{ OrchestratorProfile: &OrchestratorProfile{ OrchestratorType: "Kubernetes", - OrchestratorVersion: "1.18.7", + OrchestratorVersion: "1.18.8", KubernetesConfig: &KubernetesConfig{ LoadBalancerOutboundIPs: to.IntPtr(17), }, diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1 index bc5d987927..2c5077daa9 100644 --- a/vhd/packer/configure-windows-vhd.ps1 +++ b/vhd/packer/configure-windows-vhd.ps1 @@ -109,7 +109,7 @@ function Get-FilesToCacheOnVHD "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.9-hotfix.20200714/windowszip/v1.17.9-hotfix.20200714-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.5/windowszip/v1.18.5-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.6/windowszip/v1.18.6-1int.zip", - "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.7/windowszip/v1.18.7-1int.zip", + "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.8/windowszip/v1.18.8-1int.zip", "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.0-rc.4/windowszip/v1.19.0-rc.4-1int.zip" ); "c:\akse-cache\win-vnet-cni\" = @( diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh index 804dbaa882..5b47608f46 100644 --- a/vhd/packer/install-dependencies.sh +++ b/vhd/packer/install-dependencies.sh @@ -365,7 +365,7 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH} K8S_VERSIONS=" 1.19.0-rc.4 -1.18.7 +1.18.8 1.18.6 1.17.9 1.17.9-azs