Skip to content

Commit 07de70b

Browse files
authored
Fix: Add stackdriver.resourceMetadata.writer role for SA to prevent monitoring errors (#485)
1 parent de8e1d5 commit 07de70b

File tree

7 files changed

+49
-0
lines changed

7 files changed

+49
-0
lines changed

autogen/main/sa.tf.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

modules/beta-private-cluster-update-variant/sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

modules/beta-private-cluster/sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

modules/beta-public-cluster/sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

modules/private-cluster-update-variant/sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

modules/private-cluster/sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

sa.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
6262
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
6363
}
6464

65+
resource "google_project_iam_member" "cluster_service_account-resourceMetadata-writer" {
66+
count = var.create_service_account ? 1 : 0
67+
project = google_project_iam_member.cluster_service_account-monitoring_viewer[0].project
68+
role = "roles/stackdriver.resourceMetadata.writer"
69+
member = "serviceAccount:${google_service_account.cluster_service_account[0].email}"
70+
}
71+
6572
resource "google_project_iam_member" "cluster_service_account-gcr" {
6673
count = var.create_service_account && var.grant_registry_access ? 1 : 0
6774
project = var.registry_project_id == "" ? var.project_id : var.registry_project_id

0 commit comments

Comments
 (0)