From 030e2f4dd3448f7d09449479c782b5a2f29701f4 Mon Sep 17 00:00:00 2001 From: jianglai Date: Fri, 27 Jul 2018 19:54:08 -0700 Subject: [PATCH] Do not explicitly depend on latest GKE version When versions are explicitly set to the latest available version, Annealing almost always fails to apply the patch due to yet-unknown reasons. The rationale for setting the versions explicitly was to ensure that the clusters are always updated in time. But it seems like it is not worth the trouble. Without the explicit latest versions, the master should still be automatic upgrade (may not be immediate after version availability): https://cloud.google.com/kubernetes-engine/versioning-and-upgrades#automatic_master_upgrades We also set "Auto Upgrade" on the nodes, which should upgrades the nodes to master versions (may not be immediate after master version upgrade). So it seems without these lines, we can still expect the gke versions of the cluster to upgrade (eventually). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=206408347 --- java/google/registry/proxy/terraform/modules/gke/cluster.tf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/java/google/registry/proxy/terraform/modules/gke/cluster.tf index 6218ceeed..6bc9d1d53 100644 --- a/java/google/registry/proxy/terraform/modules/gke/cluster.tf +++ b/java/google/registry/proxy/terraform/modules/gke/cluster.tf @@ -2,15 +2,9 @@ locals { proxy_cluster_zone = "${lookup(var.proxy_cluster_zones, var.proxy_cluster_region)}" } -data "google_container_engine_versions" "gke_version" { - zone = "${local.proxy_cluster_zone}" -} - resource "google_container_cluster" "proxy_cluster" { name = "proxy-cluster-${var.proxy_cluster_region}" zone = "${local.proxy_cluster_zone}" - node_version = "${data.google_container_engine_versions.gke_version.latest_node_version}" - min_master_version = "${data.google_container_engine_versions.gke_version.latest_master_version}" timeouts { update = "30m"