From c7ae9afc7900355ad2d19573199f556b453ae763 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 7 Jul 2024 18:01:14 -0500 Subject: [PATCH] Delete k8s-infra-kops-ci-results GCS bucket This bucket was never used so we are deleting it to avoid confusion --- .../kubernetes-public/prowjob-buckets.tf | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/infra/gcp/terraform/kubernetes-public/prowjob-buckets.tf b/infra/gcp/terraform/kubernetes-public/prowjob-buckets.tf index f34bf9b1768..798cdfa4784 100644 --- a/infra/gcp/terraform/kubernetes-public/prowjob-buckets.tf +++ b/infra/gcp/terraform/kubernetes-public/prowjob-buckets.tf @@ -19,7 +19,6 @@ This file defines all GCS buckets that prow jobs write to */ locals { - kops_ci_bucket_name = "k8s-infra-kops-ci-results" // Name of the bucket for kops ci jobs results (version markers, binaries, etc...) scalability_tests_logs_bucket_name = "k8s-infra-scalability-tests-logs" // Name of the bucket for the scalability test results scalability_golang_builds_bucket_name = "k8s-infra-scale-golang-builds" // Name of the bucket for the scalability golang builds } @@ -138,56 +137,3 @@ resource "google_storage_bucket_iam_policy" "scalability_golang_builds_policy" { bucket = google_storage_bucket.scalability_golang_builds.name policy_data = data.google_iam_policy.scalability_golang_builds_bindings.policy_data } - -// Bucket for kops CI jobs results -resource "google_storage_bucket" "kops_ci_bucket" { - project = data.google_project.project.project_id - name = local.kops_ci_bucket_name - location = "US" - uniform_bucket_level_access = true -} - -data "google_iam_policy" "kops_ci_bucket_bindings" { - // Ensure k8s-infra-kops-maintainers has admin privileges - binding { - members = [ - "group:k8s-infra-kops-maintainers@kubernetes.io", - ] - role = "roles/storage.admin" - } - // Maintain legacy admins privilegies - binding { - members = [ - "group:k8s-infra-kops-maintainers@kubernetes.io", - "projectEditor:${data.google_project.project.project_id}", - "projectOwner:${data.google_project.project.project_id}", - ] - role = "roles/storage.legacyBucketOwner" - } - binding { - members = [ - "projectViewer:${data.google_project.project.project_id}", - ] - role = "roles/storage.legacyBucketReader" - } - // Ensure prow-build serviceaccount can write to bucket - binding { - role = "roles/storage.objectAdmin" - members = [ - "serviceAccount:prow-build@k8s-infra-prow-build.iam.gserviceaccount.com", - ] - } - // Ensure bucket is world readable - binding { - role = "roles/storage.objectViewer" - members = [ - "allUsers" - ] - } -} - -// Authoritative iam-policy: replaces any existing policy attached to the bucket -resource "google_storage_bucket_iam_policy" "kops_ci_bucket_bindings" { - bucket = google_storage_bucket.kops_ci_bucket.name - policy_data = data.google_iam_policy.kops_ci_bucket_bindings.policy_data -}