From db7ba49668e7f7259040273bfaee1fc5b8fe96e3 Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Mon, 16 Nov 2020 23:43:24 -0800 Subject: [PATCH] Upgrade terraform and test clusters to 1.17 (#1901) This updates test clusters to 1.17, as well as the kubectl client version to match. Initial smoke tests show that everything is working as expected at this time. --- build/build-image/Dockerfile | 2 +- build/e2e-image/Dockerfile | 2 +- install/terraform/modules/gke/cluster.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile index 1a76c8dd62..b7c2fd246e 100644 --- a/build/build-image/Dockerfile +++ b/build/build-image/Dockerfile @@ -45,7 +45,7 @@ RUN go get -u golang.org/x/tools/cmd/goimports RUN gcloud components update && gcloud components install app-engine-go # the kubernetes version for the file -ENV KUBERNETES_VER 1.16.15 +ENV KUBERNETES_VER 1.17.13 # overwrite kubectl as we want a specific version RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VER}/bin/linux/amd64/kubectl && \ diff --git a/build/e2e-image/Dockerfile b/build/e2e-image/Dockerfile index 15b8fcf5d2..9facd58d39 100644 --- a/build/e2e-image/Dockerfile +++ b/build/e2e-image/Dockerfile @@ -15,7 +15,7 @@ RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \ ENV PATH /usr/local/go/bin:/go/bin:$PATH # install kubectl without gcloud as we want the last version -ENV KUBECTL_VER 1.16.15 +ENV KUBECTL_VER 1.17.13 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/linux/amd64/kubectl && \ chmod go+rx ./kubectl && \ mv ./kubectl /usr/local/bin/kubectl diff --git a/install/terraform/modules/gke/cluster.tf b/install/terraform/modules/gke/cluster.tf index a9dc758e1d..02dfb7e485 100644 --- a/install/terraform/modules/gke/cluster.tf +++ b/install/terraform/modules/gke/cluster.tf @@ -29,7 +29,7 @@ locals { initialNodeCount = lookup(var.cluster, "initialNodeCount", "4") network = lookup(var.cluster, "network", "default") subnetwork = lookup(var.cluster, "subnetwork", "") - kubernetesVersion = lookup(var.cluster, "kubernetesVersion", "1.16") + kubernetesVersion = lookup(var.cluster, "kubernetesVersion", "1.17") } # echo command used for debugging purpose