Merge branch 'master' into feature/czka-node-pool-metadata-key-value-pairs

Author: Jberlinsky

.kitchen.yml

@@ -31,6 +31,7 @@ suites:
  root_module_directory: test/fixtures/deploy_service
  verifier:
  name: terraform
+ color: false
  systems:
  - name: deploy_service
  backend: local
@@ -43,6 +44,7 @@ suites:
  root_module_directory: test/fixtures/node_pool
  verifier:
  name: terraform
+ color: false
  systems:
  - name: node_pool
  backend: local
@@ -55,6 +57,7 @@ suites:
  root_module_directory: test/fixtures/shared_vpc
  verifier:
  name: terraform
+ color: false
  systems:
  - name: shared_vpc
  backend: local
@@ -67,6 +70,7 @@ suites:
  root_module_directory: test/fixtures/simple_regional
  verifier:
  name: terraform
+ color: false
  systems:
  - name: simple_regional
  backend: local
@@ -79,6 +83,7 @@ suites:
  root_module_directory: test/fixtures/simple_zonal
  verifier:
  name: terraform
+ color: false
  systems:
  - name: simple_zonal
  backend: local
@@ -91,6 +96,7 @@ suites:
  root_module_directory: test/fixtures/stub_domains
  verifier:
  name: terraform
+ color: false
  systems:
  - name: stub_domains
  backend: local

main.tf

@@ -51,7 +51,7 @@ locals {
  }
 
  cluster_type_output_regional_zones = "${concat(google_container_cluster.primary.*.additional_zones, list(list()))}"
- cluster_type_output_zonal_zones = "${concat(google_container_cluster.zonal_primary.*.additional_zones, list(list()))}"
+ cluster_type_output_zonal_zones = "${concat(slice(var.zones,1,length(var.zones)), list(list()))}"
 
  cluster_type_output_zones = {
  regional = "${local.cluster_type_output_regional_zones[0]}"

test/fixtures/simple_zonal/example.tf

@@ -21,7 +21,7 @@ module "example" {
  credentials_path = "${local.credentials_path}"
  cluster_name_suffix = "-${random_string.suffix.result}"
  region = "${var.region}"
- zones = ["${var.zones}"]
+ zones = ["${slice(var.zones,0,1)}"]
  network = "${google_compute_network.main.name}"
  subnetwork = "${google_compute_subnetwork.main.name}"
  ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"

test/integration/simple_zonal/controls/gcloud.rb

@@ -42,6 +42,10 @@
  expect(data['location']).to match(/^(.*)[1-9]-[a-z]$/)
  end
 
+ it "is single zoned" do
+ expect(data['locations'].size).to eq 1
+ end
+
  it "has the expected initial cluster version" do
  expect(data['initialClusterVersion']).to eq "1.11.4-gke.13"
  end

variables.tf

@@ -39,7 +39,7 @@ variable "region" {
 variable "zones" {
  type = "list"
  description = "The zones to host the cluster in (optional if regional cluster / required if zonal)"
- default = []
+ default = [""]
 }
 
 variable "network" {