Skip to content

Commit

Permalink
wip - quoting workaround +drop
Browse files Browse the repository at this point in the history
  • Loading branch information
emalloy committed Mar 26, 2019
1 parent 63112d5 commit bbaace1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion test/ci_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ setup_environment() {
export TF_VAR_credentials_path_relative="../shared/credentials.json"
export TF_VAR_region="$REGION"
export TF_VAR_zones="$ZONES"
export TF_VAR_cluster_resource_labels="$CLUSTER_RESOURCE_LABELS"
# export TF_VAR_cluster_resource_labels="$CLUSTER_RESOURCE_LABELS"
export TF_VAR_compute_engine_service_account="$COMPUTE_ENGINE_SERVICE_ACCOUNT"
}

Expand Down
1 change: 0 additions & 1 deletion test/fixtures/simple_regional/terraform.tfvars

This file was deleted.

1 change: 1 addition & 0 deletions test/fixtures/simple_regional/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cluster_resource_labels = {created-by = "terraform"}
19 changes: 10 additions & 9 deletions test/fixtures/simple_zonal/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
module "example" {
source = "../../../examples/simple_zonal"

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
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}"
ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
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}"
ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
cluster_resource_labels = "${var.cluster_resource_labels}"
}

0 comments on commit bbaace1

Please sign in to comment.