From 806628be0d6cdc477f1228b32beb727c7cacc51d Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 3 Dec 2018 21:07:23 -0700 Subject: [PATCH 1/5] 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 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 5ef1ae4ae9..31ff14dd7b 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -159,7 +159,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.8 1.10.9 1.11.5 1.11.6 1.12.1 1.12.2 1.13.1" +K8S_VERSIONS="1.7.15 1.7.16 1.8.14 1.8.15 1.9.10 1.9.11 1.10.8 1.10.9 1.11.5 1.11.6 1.12.2 1.12.4 1.13.1" 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 f00585391d..3e1342e7a3 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -91,7 +91,7 @@ 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.13.0-alpha.1": false, "1.13.0-alpha.2": false, From 0e1ab04791c0e1e0ab09f687fb4146c38abb79b9 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 3 Dec 2018 21:14:02 -0700 Subject: [PATCH 2/5] Bump cluster-autoscaler to recommended version for 1.12.3 --- packer/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 31ff14dd7b..a7a7ed8a66 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -91,7 +91,7 @@ for TILLER_VERSION in ${TILLER_VERSIONS}; do pullContainerImage "docker" "gcr.io/kubernetes-helm/tiller:v${TILLER_VERSION}" done -CLUSTER_AUTOSCALER_VERSIONS="1.13.1 1.3.4 1.3.3 1.2.2 1.1.2" +CLUSTER_AUTOSCALER_VERSIONS="1.13.1 1.12.1 1.3.4 1.3.3 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 From d6eb154491e7c0a25b3ff934d09830049fa82c51 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 17 Dec 2018 10:05:22 -0700 Subject: [PATCH 3/5] Bump to k8s 1.12.4 See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.12.md#v1124 --- pkg/api/common/versions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/api/common/versions.go b/pkg/api/common/versions.go index 3e1342e7a3..6a72e9ac44 100644 --- a/pkg/api/common/versions.go +++ b/pkg/api/common/versions.go @@ -93,6 +93,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ "1.12.0": false, "1.12.1": false, "1.12.2": true, + "1.12.4": true, "1.13.0-alpha.1": false, "1.13.0-alpha.2": false, "1.13.1": true, From c62187314e800bf93ff5f1c21812155a55bb7f82 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 18 Dec 2018 14:59:31 -0700 Subject: [PATCH 4/5] Move cluster-autoscaler bump to correct stanza --- pkg/api/k8s_versions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go index 9bfcd579c7..dbbc153168 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, From f4eccb490992de38385b95dc0b93562b9833e1ad Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Tue, 18 Dec 2018 14:06:25 -0800 Subject: [PATCH 5/5] enable 20 mins for HPA scale down --- test/e2e/kubernetes/kubernetes_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index baf7d50767..1c51e1626d 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -670,7 +670,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu Expect(err).NotTo(HaveOccurred()) By("Ensuring we only have 1 apache-php pod after stopping load") - _, err = phpApacheDeploy.WaitForReplicas(-1, 1, 5*time.Second, cfg.Timeout) + _, err = phpApacheDeploy.WaitForReplicas(-1, 1, 5*time.Second, 20*time.Minute) Expect(err).NotTo(HaveOccurred()) h, err = hpa.Get(longRunningApacheDeploymentName, "default") Expect(err).NotTo(HaveOccurred())