Skip to content

infra/gcp/k8s-infra-public-pii: fix post-deployment issue of 2031. #2212

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

Merged
k8s-ci-robot merged 1 commit into from
Jun 14, 2021
Merged

infra/gcp/k8s-infra-public-pii: fix post-deployment issue of 2031. #2212

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
11 changes: 7 additions & 4 deletions infra/gcp/clusters/projects/k8s-infra-public-pii/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ resource "google_project_service" "project" {
for_each = toset([
"bigquery.googleapis.com",
"bigqueryreservation.googleapis.com",
"bigquerytransfer.googleapis.com",
"bigquerydatatransfer.googleapis.com",
"storage-component.googleapis.com"
])

Expand Down Expand Up @@ -83,11 +83,12 @@ resource "google_storage_bucket" "audit-logs-gcs" {

// NOTE: Prevent the bucket from being deleted
lifecycle {
prevent_destroy = false
prevent_destroy = true
}
}

// Grant write access to group-cloud-storage-analytics@google.com

/* TODO(ameukam): This not working. possible conflict between both bindings
data "google_iam_policy" "storage_policy_objectadmin" {
binding {
role = "roles/storage.objectAdmin"
Expand All @@ -102,6 +103,8 @@ resource "google_storage_bucket_iam_policy" "analytics_objectadmin_policy" {
policy_data = data.google_iam_policy.storage_policy_objectadmin.policy_data
}



data "google_iam_policy" "storage_policy_legacybucketwriter" {
binding {
role = "roles/storage.legacyBucketWriter"
Expand All @@ -114,7 +117,7 @@ data "google_iam_policy" "storage_policy_legacybucketwriter" {
resource "google_storage_bucket_iam_policy" "analytics_legacybucketwriter_policy" {
bucket = google_storage_bucket.audit-logs-gcs.name
policy_data = data.google_iam_policy.storage_policy_legacybucketwriter.policy_data
}
} */

// Allow ready-only access to k8s-infra-gcs-access-logs@kubernetes.io
resource "google_storage_bucket_iam_member" "artificats-gcs-logs" {
Expand Down