Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Google provider version and rename service accounts in regional configuration #112

Merged
merged 1 commit into from
Feb 9, 2025
Merged

Update Google provider version and rename service accounts in regional configuration #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ No requirements.

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | 6.16.0 |
| <a name="provider_google"></a> [google](#provider\_google) | 6.19.0 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.6.3 |

### Modules
Expand Down
8 changes: 4 additions & 4 deletions regional/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ No requirements.

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | 6.16.0 |
| <a name="provider_google"></a> [google](#provider\_google) | 6.19.0 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.6.3 |

## Modules
Expand All @@ -33,8 +33,8 @@ No requirements.
| [google_kms_crypto_key.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/kms_crypto_key) | resource |
| [google_kms_crypto_key_iam_member.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/kms_crypto_key_iam_member) | resource |
| [google_kms_key_ring.cluster_encryption](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/kms_key_ring) | resource |
| [google_project_iam_member.gke_operations](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
| [google_service_account.gke_operations](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/service_account) | resource |
| [google_project_iam_member.default_node](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
| [google_service_account.default_node](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/service_account) | resource |
| [random_id.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |
| [google_cloud_identity_group_lookup.registry_readers](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/cloud_identity_group_lookup) | data source |
| [google_container_engine_versions.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_engine_versions) | data source |
Expand Down Expand Up @@ -73,5 +73,5 @@ No requirements.
| <a name="output_kms_crypto_key_cluster_boot_disk_encryption_name"></a> [kms\_crypto\_key\_cluster\_boot\_disk\_encryption\_name](#output\_kms\_crypto\_key\_cluster\_boot\_disk\_encryption\_name) | The name of the Google Cloud KMS crypto key used to encrypt the boot disk |
| <a name="output_kms_crypto_key_cluster_database_encryption_name"></a> [kms\_crypto\_key\_cluster\_database\_encryption\_name](#output\_kms\_crypto\_key\_cluster\_database\_encryption\_name) | The name of the Google Cloud KMS crypto key used to encrypt the secrets |
| <a name="output_kms_key_ring_cluster_encryption_name"></a> [kms\_key\_ring\_cluster\_encryption\_name](#output\_kms\_key\_ring\_cluster\_encryption\_name) | The name of the Google Cloud KMS key ring |
| <a name="output_service_account_gke_operations_email"></a> [service\_account\_gke\_operations\_email](#output\_service\_account\_gke\_operations\_email) | The email address of the Kubernetes minimum privilege service account for the cluster |
| <a name="output_service_account_default_node_email"></a> [service\_account\_default\_node\_email](#output\_service\_account\_default\_node\_email) | The email address of the Kubernetes minimum privilege service account for the cluster |
<!-- END_TF_DOCS -->
18 changes: 7 additions & 11 deletions regional/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ resource "google_cloud_identity_group_membership" "registry_readers" {
group = data.google_cloud_identity_group_lookup.registry_readers.name

preferred_member_key {
id = google_service_account.gke_operations.email
id = google_service_account.default_node.email
}

roles { name = "MEMBER" }
Expand Down Expand Up @@ -72,7 +72,7 @@ resource "google_container_cluster" "this" {
disk_type = var.cluster_autoscaling.disk_type
image_type = var.cluster_autoscaling.image_type
oauth_scopes = var.cluster_autoscaling.oauth_scopes
service_account = google_service_account.gke_operations.email
service_account = google_service_account.default_node.email

management {
auto_repair = true
Expand Down Expand Up @@ -269,7 +269,7 @@ resource "google_container_node_pool" "this" {
}

oauth_scopes = each.value.oauth_scopes
service_account = google_service_account.gke_operations.email
service_account = google_service_account.default_node.email

shielded_instance_config {
enable_integrity_monitoring = true
Expand Down Expand Up @@ -413,20 +413,16 @@ resource "google_kms_key_ring" "cluster_encryption" {
# Project IAM Member Resource
# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_project_iam_member

resource "google_project_iam_member" "gke_operations" {
for_each = toset([
"roles/container.defaultNodeServiceAccount"
])

member = "serviceAccount:${google_service_account.gke_operations.email}"
resource "google_project_iam_member" "default_node" {
member = "serviceAccount:${google_service_account.default_node.email}"
project = var.project
role = each.value
role = "roles/container.defaultNodeServiceAccount"
}

# Service Account Resource
# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account

resource "google_service_account" "gke_operations" {
resource "google_service_account" "default_node" {
account_id = "gke-${random_id.this.hex}"
display_name = "Kubernetes minimum privilege service account for: ${local.name}"
project = var.project
Expand Down
1 change: 1 addition & 0 deletions regional/onboarding/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ No requirements.

| Name | Type |
|------|------|
| [kubernetes_namespace_v1.gatekeeper-system](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace_v1) | resource |
| [kubernetes_namespace_v1.this](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace_v1) | resource |
| [kubernetes_role_binding_v1.namespace_admin](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/role_binding_v1) | resource |
| [kubernetes_role_v1.namespace_admin](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/role_v1) | resource |
Expand Down
23 changes: 16 additions & 7 deletions regional/onboarding/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,26 @@ data "google_service_account" "workload_identity" {
# Kubernetes Namespace Resource
# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace_v1

resource "kubernetes_namespace_v1" "gatekeeper-system" {
metadata {
labels = {
"admission.gatekeeper.sh/ignore" = "no-self-managing"
"istio-injection" = "disabled"
}

name = "gatekeeper-system"
}
}

resource "kubernetes_namespace_v1" "this" {
for_each = merge(
var.namespaces,
{
"cert-manager" = { istio_injection = "disabled" },
"datadog" = { istio_injection = "disabled" },
"gatekeeper-system" = { istio_injection = "disabled" },
"istio-ingress" = { istio_injection = "enabled" },
"istio-system" = { istio_injection = "disabled" }
"istio-test" = { istio_injection = "enabled" }
"cert-manager" = { istio_injection = "disabled" },
"datadog" = { istio_injection = "disabled" },
"istio-ingress" = { istio_injection = "enabled" },
"istio-system" = { istio_injection = "disabled" }
"istio-test" = { istio_injection = "enabled" }
}
)

Expand All @@ -32,7 +42,6 @@ resource "kubernetes_namespace_v1" "this" {
}
}


# Kubernetes Role Resource
# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/role_v1

Expand Down
4 changes: 2 additions & 2 deletions regional/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ output "kms_crypto_key_cluster_boot_disk_encryption_name" {
value = google_kms_crypto_key.this["cluster-boot-disk-encryption"].name
}

output "service_account_gke_operations_email" {
output "service_account_default_node_email" {
description = "The email address of the Kubernetes minimum privilege service account for the cluster"
value = google_service_account.gke_operations.email
value = google_service_account.default_node.email
}