From b343dea6ddc2c0e3a9092b288dcd41487110a936 Mon Sep 17 00:00:00 2001 From: Jason Berlinsky Date: Wed, 9 Jan 2019 10:17:49 -0500 Subject: [PATCH] Remove explicit versions from test cases and examples --- examples/deploy_service/main.tf | 7 +++--- examples/node_pool/main.tf | 18 +++++++-------- examples/shared_vpc/main.tf | 2 -- examples/simple_regional/main.tf | 22 +++++++++---------- examples/stub_domains/main.tf | 22 +++++++++---------- .../deploy_service/controls/gcloud.rb | 4 ---- .../simple_regional/controls/gcloud.rb | 12 ---------- 7 files changed, 31 insertions(+), 56 deletions(-) diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index d73092c253..be060890a1 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -40,10 +40,9 @@ module "gke" { network = "${var.network}" subnetwork = "${var.subnetwork}" - ip_range_pods = "${var.ip_range_pods}" - ip_range_services = "${var.ip_range_services}" - kubernetes_version = "1.11.5-gke.4" - service_account = "${var.compute_engine_service_account}" + ip_range_pods = "${var.ip_range_pods}" + ip_range_services = "${var.ip_range_services}" + service_account = "${var.compute_engine_service_account}" } resource "kubernetes_pod" "nginx-example" { diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index df399e4256..6f4e11c6af 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -24,16 +24,14 @@ provider "google" { } module "gke" { - source = "../../" - project_id = "${var.project_id}" - name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" - region = "${var.region}" - network = "${var.network}" - subnetwork = "${var.subnetwork}" - ip_range_pods = "${var.ip_range_pods}" - ip_range_services = "${var.ip_range_services}" - kubernetes_version = "1.11.5-gke.4" - node_version = "1.11.5-gke.4" + source = "../../" + project_id = "${var.project_id}" + name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" + region = "${var.region}" + network = "${var.network}" + subnetwork = "${var.subnetwork}" + ip_range_pods = "${var.ip_range_pods}" + ip_range_services = "${var.ip_range_services}" node_pools = [ { diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index 953e5ca4e6..e123b91a12 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -33,8 +33,6 @@ module "gke" { subnetwork = "${var.subnetwork}" ip_range_pods = "${var.ip_range_pods}" ip_range_services = "${var.ip_range_services}" - kubernetes_version = "1.11.5-gke.4" - node_version = "1.11.5-gke.4" service_account = "${var.compute_engine_service_account}" } diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index ef16f94747..5694ace8e4 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -24,18 +24,16 @@ provider "google" { } module "gke" { - source = "../../" - project_id = "${var.project_id}" - name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" - regional = true - region = "${var.region}" - network = "${var.network}" - subnetwork = "${var.subnetwork}" - ip_range_pods = "${var.ip_range_pods}" - ip_range_services = "${var.ip_range_services}" - kubernetes_version = "1.11.5-gke.4" - node_version = "1.11.5-gke.4" - service_account = "${var.compute_engine_service_account}" + source = "../../" + project_id = "${var.project_id}" + name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" + regional = true + region = "${var.region}" + network = "${var.network}" + subnetwork = "${var.subnetwork}" + ip_range_pods = "${var.ip_range_pods}" + ip_range_services = "${var.ip_range_services}" + service_account = "${var.compute_engine_service_account}" } data "google_client_config" "default" {} diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 2b6810968b..0e5999edf0 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -24,18 +24,16 @@ provider "google" { } module "gke" { - source = "../../" - project_id = "${var.project_id}" - name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" - region = "${var.region}" - network = "${var.network}" - subnetwork = "${var.subnetwork}" - ip_range_pods = "${var.ip_range_pods}" - ip_range_services = "${var.ip_range_services}" - network_policy = true - kubernetes_version = "1.11.5-gke.4" - node_version = "1.11.5-gke.4" - service_account = "${var.compute_engine_service_account}" + source = "../../" + project_id = "${var.project_id}" + name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" + region = "${var.region}" + network = "${var.network}" + subnetwork = "${var.subnetwork}" + ip_range_pods = "${var.ip_range_pods}" + ip_range_services = "${var.ip_range_services}" + network_policy = true + service_account = "${var.compute_engine_service_account}" stub_domains { "example.com" = [ diff --git a/test/integration/deploy_service/controls/gcloud.rb b/test/integration/deploy_service/controls/gcloud.rb index d31c6f973d..ccdcd3e461 100644 --- a/test/integration/deploy_service/controls/gcloud.rb +++ b/test/integration/deploy_service/controls/gcloud.rb @@ -37,10 +37,6 @@ it "is running" do expect(data['status']).to eq 'RUNNING' end - - it "has the expected initial cluster version" do - expect(data['initialClusterVersion']).to eq "1.11.5-gke.4" - end end end end diff --git a/test/integration/simple_regional/controls/gcloud.rb b/test/integration/simple_regional/controls/gcloud.rb index 074122af28..c8a5e61bca 100644 --- a/test/integration/simple_regional/controls/gcloud.rb +++ b/test/integration/simple_regional/controls/gcloud.rb @@ -42,10 +42,6 @@ expect(data['location']).to match(/^.*[1-9]$/) end - it "has the expected initial cluster version" do - expect(data['initialClusterVersion']).to eq "1.11.5-gke.4" - end - it "has the expected addon settings" do expect(data['addonsConfig']).to eq({ "horizontalPodAutoscaling" => {}, @@ -75,14 +71,6 @@ describe "node pool" do let(:node_pools) { data['nodePools'].reject { |p| p['name'] == "default-pool" } } - it "is running the expected version of Kubernetes" do - expect(node_pools).to include( - including( - "version" => "1.11.5-gke.4", - ) - ) - end - it "has autoscaling enabled" do expect(node_pools).to include( including(