From 6cabc6f26b18cfef89e7277b53fc640b713c5031 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 26 Nov 2018 09:56:56 -0700 Subject: [PATCH 1/2] Add support for Kubernetes 1.12.3 See https://github.com/kubernetes/kubernetes/releases/tag/v1.12.3 --- packer/install-dependencies.sh | 2 +- pkg/api/common/versions.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index ee62b50132..5a8e8fc042 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -157,7 +157,7 @@ done pullContainerImage "docker" "busybox" # TODO: fetch supported k8s versions from an aks-engine command instead of hardcoding them here -K8S_VERSIONS="1.7.15 1.7.16 1.8.14 1.8.15 1.9.10 1.9.11 1.10.10 1.10.11 1.11.4 1.11.5 1.12.1 1.12.2" +K8S_VERSIONS="1.7.15 1.7.16 1.8.14 1.8.15 1.9.10 1.9.11 1.10.10 1.10.11 1.11.3 1.11.4 1.12.2 1.12.3" for KUBERNETES_VERSION in ${K8S_VERSIONS}; do HYPERKUBE_URL="k8s.gcr.io/hyperkube-amd64:v${KUBERNETES_VERSION}" diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 532afc9091..dfb8f570bd 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -92,8 +92,9 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.12.0-rc.1": false, "1.12.0-rc.2": false, "1.12.0": false, - "1.12.1": true, + "1.12.1": false, "1.12.2": true, + "1.12.3": true, "1.13.0-alpha.1": true, "1.13.0-alpha.2": true, } From 9ae6268293da491a3e7f992178e7be5c11fbd562 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 26 Nov 2018 10:01:10 -0700 Subject: [PATCH 2/2] Bump cluster-autoscaler to recommended version for 1.12.3 --- packer/install-dependencies.sh | 2 +- pkg/api/k8s_versions.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 5a8e8fc042..cf2ae3e804 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -94,7 +94,7 @@ for TILLER_VERSION in ${TILLER_VERSIONS}; do pullContainerImage "docker" "gcr.io/kubernetes-helm/tiller:v${TILLER_VERSION}" done -CLUSTER_AUTOSCALER_VERSIONS="1.3.4 1.3.3 1.2.2 1.1.2" +CLUSTER_AUTOSCALER_VERSIONS="1.12.1 1.3.4 1.3.3 1.3.1 1.3.0 1.2.2 1.1.2" for CLUSTER_AUTOSCALER_VERSION in ${CLUSTER_AUTOSCALER_VERSIONS}; do pullContainerImage "docker" "k8s.gcr.io/cluster-autoscaler:v${CLUSTER_AUTOSCALER_VERSION}" done diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go index cf5c8ae7b0..d2a8053089 100644 --- a/pkg/api/k8s_versions.go +++ b/pkg/api/k8s_versions.go @@ -63,7 +63,7 @@ var k8sComponentVersions = map[string]map[string]string{ "aci-connector": "virtual-kubelet:latest", ContainerMonitoringAddonName: "oms:ciprod10162018-2", AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.4", - "cluster-autoscaler": "cluster-autoscaler:v1.3.3", + "cluster-autoscaler": "cluster-autoscaler:v1.12.1", NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11", "k8s-dns-sidecar": "k8s-dns-sidecar-amd64:1.14.10", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,