Skip to content

Commit bbaace1

Browse files
committed
wip - quoting workaround +drop
1 parent 63112d5 commit bbaace1

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

test/ci_integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ setup_environment() {
4343
export TF_VAR_credentials_path_relative="../shared/credentials.json"
4444
export TF_VAR_region="$REGION"
4545
export TF_VAR_zones="$ZONES"
46-
export TF_VAR_cluster_resource_labels="$CLUSTER_RESOURCE_LABELS"
46+
# export TF_VAR_cluster_resource_labels="$CLUSTER_RESOURCE_LABELS"
4747
export TF_VAR_compute_engine_service_account="$COMPUTE_ENGINE_SERVICE_ACCOUNT"
4848
}
4949

test/fixtures/simple_regional/terraform.tfvars

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cluster_resource_labels = {created-by = "terraform"}

test/fixtures/simple_zonal/example.tf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
module "example" {
1818
source = "../../../examples/simple_zonal"
1919

20-
project_id = "${var.project_id}"
21-
credentials_path = "${local.credentials_path}"
22-
cluster_name_suffix = "-${random_string.suffix.result}"
23-
region = "${var.region}"
24-
zones = ["${slice(var.zones,0,1)}"]
25-
network = "${google_compute_network.main.name}"
26-
subnetwork = "${google_compute_subnetwork.main.name}"
27-
ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
28-
ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
20+
project_id = "${var.project_id}"
21+
credentials_path = "${local.credentials_path}"
22+
cluster_name_suffix = "-${random_string.suffix.result}"
23+
region = "${var.region}"
24+
zones = ["${slice(var.zones,0,1)}"]
25+
network = "${google_compute_network.main.name}"
26+
subnetwork = "${google_compute_subnetwork.main.name}"
27+
ip_range_pods = "${google_compute_subnetwork.main.secondary_ip_range.0.range_name}"
28+
ip_range_services = "${google_compute_subnetwork.main.secondary_ip_range.1.range_name}"
29+
cluster_resource_labels = "${var.cluster_resource_labels}"
2930
}

0 commit comments

Comments
 (0)