From 0db2be6d10e178cda371c203431fe4c44645b74e Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 11 Sep 2018 12:35:16 -0700 Subject: [PATCH] test: terraform uses data source to get latest GKE version --- test/terraform/main.tf | 8 ++++++-- test/terraform/variables.tf | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/terraform/main.tf b/test/terraform/main.tf index dec20cf..a73df6a 100644 --- a/test/terraform/main.tf +++ b/test/terraform/main.tf @@ -10,14 +10,18 @@ resource "random_id" "suffix" { byte_length = 4 } +data "google_container_engine_versions" "main" { + zone = "${var.zone}" +} + resource "google_container_cluster" "cluster" { name = "consul-k8s-${random_id.suffix.dec}" project = "${var.project}" enable_legacy_abac = true initial_node_count = 5 zone = "${var.zone}" - min_master_version = "${var.k8s_version}" - node_version = "${var.k8s_version}" + min_master_version = "${data.google_container_engine_versions.main.latest_master_version}" + node_version = "${data.google_container_engine_versions.main.latest_node_version}" } resource "null_resource" "kubectl" { diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf index 4a5c70c..c64cf06 100644 --- a/test/terraform/variables.tf +++ b/test/terraform/variables.tf @@ -1,8 +1,3 @@ -variable "k8s_version" { - default = "1.10.5-gke.4" - description = "The K8S version to use for both master and nodes." -} - variable "project" { description = <