-
Notifications
You must be signed in to change notification settings - Fork 820
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3021 from ameukam/tf-prepare-provide-upgrade
terraform: Prepare upgrade terraform to 4.0.0
- Loading branch information
Showing
17 changed files
with
51 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,7 +93,7 @@ resource "google_bigquery_dataset" "test_usage_metering" { | |
// IMPORTANT: The prod_ and test_ forms of this resource MUST be kept in sync. | ||
// Any changes in one MUST be reflected in the other. | ||
resource "google_container_cluster" "prod_cluster" { | ||
count = var.is_prod_cluster == "true" ? 1 : 0 | ||
count = var.is_prod_cluster == "true" ? 1 : 0 | ||
|
||
name = var.cluster_name | ||
location = var.cluster_location | ||
|
@@ -117,24 +117,14 @@ resource "google_container_cluster" "prod_cluster" { | |
// objects | ||
remove_default_node_pool = true | ||
|
||
// Disable local and certificate auth | ||
master_auth { | ||
username = "" | ||
password = "" | ||
|
||
client_certificate_config { | ||
issue_client_certificate = false | ||
} | ||
} | ||
|
||
// Enable google-groups for RBAC | ||
authenticator_groups_config { | ||
security_group = "[email protected]" | ||
} | ||
|
||
// Enable workload identity for GCP IAM | ||
workload_identity_config { | ||
identity_namespace = "${var.project_name}.svc.id.goog" | ||
workload_pool = "${var.project_name}.svc.id.goog" | ||
} | ||
|
||
// Enable Stackdriver Kubernetes Monitoring | ||
|
@@ -185,6 +175,9 @@ resource "google_container_cluster" "prod_cluster" { | |
} | ||
} | ||
|
||
// Enable Shielded Nodes feature | ||
enable_shielded_nodes = var.enable_shielded_nodes | ||
|
||
release_channel { | ||
channel = var.release_channel | ||
} | ||
|
@@ -195,7 +188,7 @@ resource "google_container_cluster" "prod_cluster" { | |
} | ||
} | ||
resource "google_container_cluster" "test_cluster" { | ||
count = var.is_prod_cluster == "true" ? 0 : 1 | ||
count = var.is_prod_cluster == "true" ? 0 : 1 | ||
|
||
name = var.cluster_name | ||
location = var.cluster_location | ||
|
@@ -218,24 +211,14 @@ resource "google_container_cluster" "test_cluster" { | |
// objects | ||
remove_default_node_pool = true | ||
|
||
// Disable local and certificate auth | ||
master_auth { | ||
username = "" | ||
password = "" | ||
|
||
client_certificate_config { | ||
issue_client_certificate = false | ||
} | ||
} | ||
|
||
// Enable google-groups for RBAC | ||
authenticator_groups_config { | ||
security_group = "[email protected]" | ||
} | ||
|
||
// Enable workload identity for GCP IAM | ||
workload_identity_config { | ||
identity_namespace = "${var.project_name}.svc.id.goog" | ||
workload_pool = "${var.project_name}.svc.id.goog" | ||
} | ||
|
||
// Enable Stackdriver Kubernetes Monitoring | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters