Skip to content

Commit

Permalink
Merge branch 'custom-gcr-project' of github.com:mmontan/terraform-goo…
Browse files Browse the repository at this point in the history
…gle-kubernetes-engine into custom-gcr-project
  • Loading branch information
mmontan committed Oct 4, 2019
2 parents 8916c06 + ac1fff3 commit 6b90fc5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions test/fixtures/workload_metadata_config/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
module "example" {
source = "../../../examples/workload_metadata_config"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5258f89... Removing a few conflicting files.
=======
>>>>>>> ac1fff378a09a704fe4c1df018552c51a5773b9d
project_id = var.project_id
cluster_name_suffix = "-${random_string.suffix.result}"
region = var.region
Expand All @@ -30,6 +33,7 @@ module "example" {
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
<<<<<<< HEAD
<<<<<<< HEAD
=======
project_id = var.project_id
cluster_name_suffix = "-${random_string.suffix.result}"
Expand All @@ -42,5 +46,7 @@ module "example" {
>>>>>>> d791335... Removed the custom test for create_service_account
=======
>>>>>>> 5258f89... Removing a few conflicting files.
=======
>>>>>>> ac1fff378a09a704fe4c1df018552c51a5773b9d
registry_project_id = var.registry_project_id
}

0 comments on commit 6b90fc5

Please sign in to comment.