feat: add support for Kubernetes v1.18.15

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md#changelog-since-v11814
Azure · Jan 14, 2021 · ba28d3f · ba28d3f
1 parent 009f67b
commit ba28d3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go
@@ -216,8 +216,9 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	"1.18.10":        false,
 	"1.18.11":        false, // replaced by 1.18.12 due to k8s release engineering issues
 	"1.18.12":        false,
-	"1.18.13":        true,
+	"1.18.13":        false,
 	"1.18.14":        true,
+	"1.18.15":        true,
 	"1.19.0-alpha.1": false,
 	"1.19.0-alpha.2": false,
 	"1.19.0-alpha.3": false,

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -157,7 +157,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 			properties: &Properties{
 				OrchestratorProfile: &OrchestratorProfile{
 					OrchestratorType:    "Kubernetes",
-					OrchestratorVersion: "1.18.13",
+					OrchestratorVersion: "1.18.15",
 					KubernetesConfig: &KubernetesConfig{
 						LoadBalancerSku:             BasicLoadBalancerSku,
 						ExcludeMasterFromStandardLB: to.BoolPtr(true),
@@ -171,7 +171,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 			properties: &Properties{
 				OrchestratorProfile: &OrchestratorProfile{
 					OrchestratorType:    "Kubernetes",
-					OrchestratorVersion: "1.18.13",
+					OrchestratorVersion: "1.18.15",
 					KubernetesConfig: &KubernetesConfig{
 						LoadBalancerOutboundIPs: to.IntPtr(17),
 					},

diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -115,9 +115,9 @@ function Get-FilesToCacheOnVHD {
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.12/windowszip/v1.17.12-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.13/windowszip/v1.17.13-1int.zip",
             "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.16/windowszip/v1.17.16-1int.zip",
-            "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.18.15/windowszip/v1.18.15-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",

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -371,8 +371,8 @@ K8S_VERSIONS="
 1.20.0
 1.19.6
 1.19.5
+1.18.15
 1.18.14
-1.18.13
 1.18.10-azs
 1.17.16
 1.17.13
-Original file line number
+Diff line change
@@ Expand Up / @@ -371,8 +371,8 @@ K8S_VERSIONS=" @@
 .20.0
 .19.6
 .19.5
+.18.15
 .18.14
-.18.13
 .18.10-azs
 .17.16
 .17.13
@@ Expand Down @@