fix!: Revert create least privilege default service account (terrafor…

…m-google-modules#1757) (terraform-google-modules#1827)
WALTER-GROUP · Dec 26, 2023 · dd53d92 · dd53d92
1 parent afa5e07
commit dd53d92
Show file tree

Hide file tree

Showing 11 changed files with 237 additions and 20 deletions.
diff --git a/autogen/main/sa.tf.tmpl b/autogen/main/sa.tf.tmpl
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/docs/upgrading_to_v30.0.md b/docs/upgrading_to_v30.0.md
@@ -0,0 +1,7 @@
+# Upgrading to v30.0
+The v30.0 release of *kubernetes-engine* is a backwards incompatible
+release.
+
+### Default cluster service account permissions modified
+
+When `create_service_account` is `true`, the service account will now be created with the `Logs Writer`, `Monitoring Metric Writer`, `Monitoring Viewer` and `Stackdriver Resource Metadata Writer` roles instead of the deprecated `Kubernetes Engine Node Service Account` role.
diff --git a/modules/beta-autopilot-private-cluster/sa.tf b/modules/beta-autopilot-private-cluster/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/beta-autopilot-public-cluster/sa.tf b/modules/beta-autopilot-public-cluster/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/beta-private-cluster-update-variant/sa.tf b/modules/beta-private-cluster-update-variant/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/beta-private-cluster/sa.tf b/modules/beta-private-cluster/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/beta-public-cluster-update-variant/sa.tf b/modules/beta-public-cluster-update-variant/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/beta-public-cluster/sa.tf b/modules/beta-public-cluster/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/private-cluster-update-variant/sa.tf b/modules/private-cluster-update-variant/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/modules/private-cluster/sa.tf b/modules/private-cluster/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }
 

diff --git a/sa.tf b/sa.tf
@@ -45,10 +45,31 @@ resource "google_service_account" "cluster_service_account" {
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 
-resource "google_project_iam_member" "cluster_service_account-nodeService_account" {
+resource "google_project_iam_member" "cluster_service_account-log_writer" {
   count   = var.create_service_account ? 1 : 0
   project = google_service_account.cluster_service_account[0].project
-  role    = "roles/container.nodeServiceAccount"
+  role    = "roles/logging.logWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-metric_writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-log_writer[0].project
+  role    = "roles/monitoring.metricWriter"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-metric_writer[0].project
+  role    = "roles/monitoring.viewer"
+  member  = google_service_account.cluster_service_account[0].member
+}
+
+resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
+  count   = var.create_service_account ? 1 : 0
+  project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
+  role    = "roles/stackdriver.resourceMetadata.writer"
   member  = google_service_account.cluster_service_account[0].member
 }