Skip to content

Commit 3316c64

Browse files
splichysplichy
committed
Merge remote-tracking branch 'upstream/master' into feat/firewall_disco_pod_ranges
2 parents 135f972 + 2fb2aac commit 3316c64

File tree

46 files changed

+2034
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2034
-734
lines changed

‎.kitchen.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ platforms:
2929
- name: local
3030

3131
suites:
32-
- name: "disable_client_cert"
33-
driver:
34-
root_module_directory: test/fixtures/disable_client_cert
35-
verifier:
36-
systems:
37-
- name: disable_client_cert
38-
backend: local
39-
controls:
40-
- gcloud
4132
- name: "shared_vpc"
4233
driver:
4334
root_module_directory: test/fixtures/shared_vpc
@@ -65,23 +56,6 @@ suites:
6556
systems:
6657
- name: simple_regional
6758
backend: local
68-
- name: "private_zonal_with_networking"
69-
driver:
70-
root_module_directory: test/fixtures/private_zonal_with_networking
71-
verifier:
72-
systems:
73-
- name: private_zonal_with_networking
74-
backend: local
75-
controls:
76-
- gcloud
77-
- name: private_zonal_with_networking
78-
backend: local
79-
controls:
80-
- subnet
81-
- name: network
82-
backend: gcp
83-
controls:
84-
- network
8559
- name: "simple_regional_with_networking"
8660
driver:
8761
root_module_directory: test/fixtures/simple_regional_with_networking
@@ -188,19 +162,6 @@ suites:
188162
systems:
189163
- name: workload_metadata_config
190164
backend: local
191-
- name: "beta_cluster"
192-
driver:
193-
root_module_directory: test/fixtures/beta_cluster
194-
verifier:
195-
systems:
196-
- name: gcloud
197-
backend: local
198-
controls:
199-
- gcloud
200-
- name: gcp
201-
backend: gcp
202-
controls:
203-
- gcp
204165
- name: "simple_windows_node_pool"
205166
driver:
206167
root_module_directory: test/fixtures/simple_windows_node_pool

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
Extending the adopted spec, each change should have a link to its corresponding pull request appended.
88

9+
## [24.1.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v24.0.0...v24.1.0) (2022-12-14)
10+
11+
12+
### Features
13+
14+
* Allow enabling cost management for safer_cluster module ([#1475](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1475)) ([8507e09](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/8507e09b732568ef3e66a1492ea6c73835b40120))
15+
916
## [24.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v23.3.0...v24.0.0) (2022-11-21)
1017

1118

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
SHELL := /usr/bin/env bash
2020

2121
# Pin to 1.3.9 per https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/1208
22-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3.9
22+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.8
2323
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2424
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2525
DOCKER_BIN ?= docker

‎autogen/main/versions.tf.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ terraform {
3232
}
3333
}
3434
provider_meta "google-beta" {
35-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.0.0"
35+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.1.0"
3636
}
3737
{% else %}
3838
required_providers {
@@ -46,7 +46,7 @@ terraform {
4646
}
4747
}
4848
provider_meta "google" {
49-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.0.0"
49+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.1.0"
5050
}
5151
{% endif %}
5252
}

‎autogen/safer-cluster/versions.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ terraform {
2323
required_version = ">=0.13"
2424

2525
provider_meta "google-beta" {
26-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.0.0"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v24.1.0"
2727
}
2828
}

‎build/int.cloudbuild.yaml

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,26 @@ steps:
2626
- prepare
2727
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
2828
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
29-
- id: converge disable-client-cert-local
29+
- id: init disable-client-cert
3030
waitFor:
31-
- create all
31+
- prepare
3232
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
33-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge disable-client-cert-local']
34-
- id: verify disable-client-cert-local
33+
args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage init --verbose --test-dir test/integration']
34+
- id: apply disable-client-cert
3535
waitFor:
36-
- converge disable-client-cert-local
36+
- init disable-client-cert
3737
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
38-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify disable-client-cert-local']
39-
- id: destroy disable-client-cert-local
38+
args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage apply --verbose --test-dir test/integration']
39+
- id: verify disable-client-cert
4040
waitFor:
41-
- verify disable-client-cert-local
41+
- apply disable-client-cert
4242
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
43-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy disable-client-cert-local']
43+
args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage verify --verbose --test-dir test/integration']
44+
- id: teardown disable-client-cert
45+
waitFor:
46+
- verify disable-client-cert
47+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
48+
args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage teardown --verbose --test-dir test/integration']
4449
- id: converge shared-vpc-local
4550
waitFor:
4651
- create all
@@ -222,21 +227,26 @@ steps:
222227
- verify workload-metadata-config-local
223228
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
224229
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy workload-metadata-config-local']
225-
- id: converge beta-cluster-local
230+
- id: init beta-cluster
226231
waitFor:
227-
- create all
232+
- prepare
233+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
234+
args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage init --verbose --test-dir test/integration']
235+
- id: apply beta-cluster
236+
waitFor:
237+
- init beta-cluster
228238
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
229-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge beta-cluster-local']
230-
- id: verify beta-cluster-local
239+
args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage apply --verbose --test-dir test/integration']
240+
- id: verify beta-cluster
231241
waitFor:
232-
- converge beta-cluster-local
242+
- apply beta-cluster
233243
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
234-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify beta-cluster-local']
235-
- id: destroy beta-cluster-local
244+
args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage verify --verbose --test-dir test/integration']
245+
- id: teardown beta-cluster
236246
waitFor:
237-
- verify beta-cluster-local
247+
- verify beta-cluster
238248
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
239-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy beta-cluster-local']
249+
args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage teardown --verbose --test-dir test/integration']
240250
- id: converge simple-windows-node-pool-local
241251
waitFor:
242252
- create all
@@ -372,11 +382,34 @@ steps:
372382
- verify simple-autopilot-public-local
373383
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
374384
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy simple-autopilot-public-local']
385+
- id: init private-zonal-with-networking
386+
waitFor:
387+
- prepare
388+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
389+
args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage init --verbose --test-dir test/integration']
390+
- id: apply private-zonal-with-networking
391+
waitFor:
392+
- init private-zonal-with-networking
393+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
394+
args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage apply --verbose --test-dir test/integration']
395+
- id: verify private-zonal-with-networking
396+
waitFor:
397+
- apply private-zonal-with-networking
398+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
399+
args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage verify --verbose --test-dir test/integration']
400+
- id: teardown private-zonal-with-networking
401+
waitFor:
402+
- verify private-zonal-with-networking
403+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
404+
args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage teardown --verbose --test-dir test/integration']
405+
406+
407+
375408
tags:
376409
- 'ci'
377410
- 'integration'
378411
substitutions:
379412
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
380-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
413+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.8'
381414
options:
382415
machineType: 'N1_HIGHCPU_8'

‎build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ tags:
2222
- 'lint'
2323
substitutions:
2424
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
25-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.5'
25+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.8'
2626
options:
2727
machineType: 'N1_HIGHCPU_8'
2828
env:

‎modules/acm/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v24.1.0"
2323
}
2424

2525
provider_meta "google-beta" {
26-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v24.0.0"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v24.1.0"
2727
}
2828

2929
required_providers {

‎modules/asm/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ terraform {
2626
}
2727

2828
provider_meta "google" {
29-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v24.0.0"
29+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v24.1.0"
3030
}
3131

3232
provider_meta "google-beta" {
33-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v24.0.0"
33+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v24.1.0"
3434
}
3535
}

‎modules/auth/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v24.1.0"
2323
}
2424
}

‎modules/beta-autopilot-private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v24.1.0"
3333
}
3434
}

‎modules/beta-autopilot-public-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v24.1.0"
3333
}
3434
}

‎modules/beta-private-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v24.1.0"
3333
}
3434
}

‎modules/beta-private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v24.1.0"
3333
}
3434
}

‎modules/beta-public-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v24.1.0"
3333
}
3434
}

‎modules/beta-public-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v24.1.0"
3333
}
3434
}

‎modules/binary-authorization/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v24.1.0"
2323
}
2424
}

‎modules/fleet-membership/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v24.1.0"
2323
}
2424
}

‎modules/hub-legacy/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v24.1.0"
2323
}
2424
}

‎modules/private-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v24.1.0"
3333
}
3434
}

‎modules/private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v24.0.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v24.1.0"
3333
}
3434
}

‎modules/safer-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ terraform {
2121
required_version = ">=0.13"
2222

2323
provider_meta "google-beta" {
24-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v24.0.0"
24+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v24.1.0"
2525
}
2626
}

‎modules/safer-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ terraform {
2121
required_version = ">=0.13"
2222

2323
provider_meta "google-beta" {
24-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v24.0.0"
24+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v24.1.0"
2525
}
2626
}

‎modules/services/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:services/v24.0.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:services/v24.1.0"
2323
}
2424
}

‎modules/workload-identity/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ terraform {
3030
}
3131

3232
provider_meta "google" {
33-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v24.0.0"
33+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:workload-identity/v24.1.0"
3434
}
3535
}

‎test/fixtures/beta_cluster/network.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ resource "google_compute_network" "main" {
2727
}
2828

2929
resource "google_compute_subnetwork" "main" {
30-
name = "cft-gke-test-${random_string.suffix.result}"
31-
ip_cidr_range = "10.0.0.0/17"
32-
region = var.region
33-
network = google_compute_network.main.self_link
34-
project = local.project_id
30+
name = "cft-gke-test-${random_string.suffix.result}"
31+
ip_cidr_range = "10.0.0.0/17"
32+
region = var.region
33+
network = google_compute_network.main.self_link
34+
project = local.project_id
35+
private_ip_google_access = true
3536

3637
secondary_ip_range {
3738
range_name = "cft-gke-test-pods-${random_string.suffix.result}"

0 commit comments

Comments
 (0)