Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 0-bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ Each step has instructions for this change.
| folder\_prefix | Name prefix to use for folders created. Should be the same in all steps. | `string` | `"fldr"` | no |
| group\_billing\_admins | Google Group for GCP Billing Administrators | `string` | n/a | yes |
| group\_org\_admins | Google Group for GCP Organization Administrators | `string` | n/a | yes |
| groups | Contain the details of the Groups to be created. | <pre>object({<br> create_groups = bool<br> billing_project = string<br> required_groups = object({<br> group_org_admins = string<br> group_billing_admins = string<br> billing_data_users = string<br> audit_data_users = string<br> monitoring_workspace_users = string<br> })<br> optional_groups = object({<br> gcp_platform_viewer = string<br> gcp_security_reviewer = string<br> gcp_network_viewer = string<br> gcp_scc_admin = string<br> gcp_global_secrets_admin = string<br> gcp_audit_viewer = string<br> })<br> })</pre> | <pre>{<br> "billing_project": "",<br> "create_groups": false,<br> "optional_groups": {<br> "gcp_audit_viewer": "",<br> "gcp_global_secrets_admin": "",<br> "gcp_network_viewer": "",<br> "gcp_platform_viewer": "",<br> "gcp_scc_admin": "",<br> "gcp_security_reviewer": ""<br> },<br> "required_groups": {<br> "audit_data_users": "",<br> "billing_data_users": "",<br> "group_billing_admins": "",<br> "group_org_admins": "",<br> "monitoring_workspace_users": ""<br> }<br>}</pre> | no |
| groups | Contain the details of the Groups to be created. | <pre>object({<br> create_groups = bool<br> billing_project = string<br> required_groups = object({<br> group_org_admins = string<br> group_billing_admins = string<br> billing_data_users = string<br> audit_data_users = string<br> monitoring_workspace_users = string<br> })<br> optional_groups = object({<br> gcp_platform_viewer = string<br> gcp_security_reviewer = string<br> gcp_network_viewer = string<br> gcp_scc_admin = string<br> gcp_global_secrets_admin = string<br> gcp_audit_viewer = string<br> })<br> })</pre> | <pre>{<br> "billing_project": null,<br> "create_groups": false,<br> "optional_groups": {<br> "gcp_audit_viewer": "",<br> "gcp_global_secrets_admin": "",<br> "gcp_network_viewer": "",<br> "gcp_platform_viewer": "",<br> "gcp_scc_admin": "",<br> "gcp_security_reviewer": ""<br> },<br> "required_groups": {<br> "audit_data_users": "",<br> "billing_data_users": "",<br> "group_billing_admins": "",<br> "group_org_admins": "",<br> "monitoring_workspace_users": ""<br> }<br>}</pre> | no |
| initial\_group\_config | Define the group configuration when it is initialized. Valid values are: WITH\_INITIAL\_OWNER, EMPTY and INITIAL\_GROUP\_CONFIG\_UNSPECIFIED. | `string` | `"WITH_INITIAL_OWNER"` | no |
| org\_id | GCP Organization ID | `string` | n/a | yes |
| org\_policy\_admin\_role | Additional Org Policy Admin role for admin group. You can use this for testing purposes. | `bool` | `false` | no |
Expand Down
2 changes: 1 addition & 1 deletion 2 0-bootstrap/modules/cb-private-pool/vpn_ha.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data "google_secret_manager_secret_version" "psk" {

module "vpn_ha_cb_to_onprem" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"
count = var.vpn_configuration.enable_vpn ? 1 : 0

project_id = var.project_id
Expand Down
2 changes: 1 addition & 1 deletion 2 0-bootstrap/modules/jenkins-agent/vpn_ha.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "vpn_ha_agent_to_onprem" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.0"
version = "~> 4.0"

project_id = module.cicd_project.project_id
region = var.default_region
Expand Down
2 changes: 1 addition & 1 deletion 2 0-bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ variable "groups" {
})
default = {
create_groups = false
billing_project = ""
billing_project = null
required_groups = {
group_org_admins = ""
group_billing_admins = ""
Expand Down
8 changes: 4 additions & 4 deletions 8 3-networks-dual-svpc/modules/vpn-ha/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ data "google_secret_manager_secret_version" "psk" {

module "vpn_ha_region1_router1" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region1
Expand Down Expand Up @@ -78,7 +78,7 @@ module "vpn_ha_region1_router1" {

module "vpn_ha_region1_router2" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region1
Expand Down Expand Up @@ -126,7 +126,7 @@ module "vpn_ha_region1_router2" {

module "vpn_ha_region2_router1" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region2
Expand Down Expand Up @@ -174,7 +174,7 @@ module "vpn_ha_region2_router1" {

module "vpn_ha_region2_router2" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region2
Expand Down
8 changes: 4 additions & 4 deletions 8 3-networks-hub-and-spoke/modules/vpn-ha/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ data "google_secret_manager_secret_version" "psk" {

module "vpn_ha_region1_router1" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region1
Expand Down Expand Up @@ -78,7 +78,7 @@ module "vpn_ha_region1_router1" {

module "vpn_ha_region1_router2" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region1
Expand Down Expand Up @@ -126,7 +126,7 @@ module "vpn_ha_region1_router2" {

module "vpn_ha_region2_router1" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region2
Expand Down Expand Up @@ -174,7 +174,7 @@ module "vpn_ha_region2_router1" {

module "vpn_ha_region2_router2" {
source = "terraform-google-modules/vpn/google//modules/vpn_ha"
version = "~> 2.3"
version = "~> 4.0"

project_id = var.project_id
region = var.default_region2
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.