17
17
module "example" {
18
18
source = " ../../../examples/workload_metadata_config"
19
19
20
- <<<<< << HEAD
21
- <<<<<<< HEAD
22
- <<<<<<< HEAD
23
- <<<<<<< HEAD
24
- =======
25
- >>>>>>> 5258f89... Removing a few conflicting files.
26
- =======
27
- >>>>>>> 244108e... Removing a few conflicting files.
28
- =======
29
- >>>>>>> 5258f89... Removing a few conflicting files.
30
20
project_id = var. project_id
31
21
cluster_name_suffix = " -${ random_string . suffix . result } "
32
22
region = var. region
@@ -35,30 +25,5 @@ module "example" {
35
25
subnetwork = google_compute_subnetwork. main . name
36
26
ip_range_pods = google_compute_subnetwork. main . secondary_ip_range [0 ]. range_name
37
27
ip_range_services = google_compute_subnetwork. main . secondary_ip_range [1 ]. range_name
38
- <<<<<<< HEAD
39
- <<<<<<< HEAD
40
- <<<<<<< HEAD
41
- =======
42
- project_id = var.project_id
43
- cluster_name_suffix = "-${ random_string . suffix . result } "
44
- region = var.region
45
- zones = slice(var.zones, 0, 1)
46
- network = google_compute_network.main.name
47
- subnetwork = google_compute_subnetwork.main.name
48
- ip_range_pods = google_compute_subnetwork.main.secondary_ip_range[0].range_name
49
- ip_range_services = google_compute_subnetwork.main.secondary_ip_range[1].range_name
50
- <<<<<<< HEAD
51
- <<<<<<< HEAD
52
- >>>>>>> d791335... Removed the custom test for create_service_account
53
- =======
54
- >>>>>>> 5258f89... Removing a few conflicting files.
55
- =======
56
- >>>>>>> e7f04bb... Removed the custom test for create_service_account
57
- =======
58
- >>>>>>> 244108e... Removing a few conflicting files.
59
- =======
60
- >>>>>>> d791335... Removed the custom test for create_service_account
61
- =======
62
- >>>>>>> 5258f89... Removing a few conflicting files.
63
28
registry_project_id = var. registry_project_id
64
29
}
0 commit comments