Skip to content

Commit

Permalink
Upgrade terraform and test clusters to 1.17 (#1901)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
markmandel committed Nov 17, 2020
1 parent c5ddc70 commit db7ba49
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion build/e2e-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/terraform/modules/gke/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit db7ba49

Please sign in to comment.