Skip to content
Merged
Changes from all commits
Commits
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
35 changes: 31 additions & 4 deletions infra/gcp/terraform/k8s-infra-prow/buckets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

module "gcb_bucket" {
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
version = "~> 11.0"
version = "~> 11.1"

name = "k8s-infra-prow-gcb"
project_id = module.project.project_id
Expand Down Expand Up @@ -86,7 +86,7 @@ module "testgrid_config_bucket" {
// See: https://github.com/kubernetes/k8s.io/issues/8973
module "testgrid_config_external_bucket" {
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
version = "~> 5"
version = "~> 12.1"

name = "k8s-testgrid-config-external"
project_id = module.project.project_id
Expand All @@ -111,10 +111,10 @@ module "testgrid_config_external_bucket" {
]
}

// Create gs://k8s-ci-logs to store logs from Prow jobs.
// Create gs://kubernetes-ci-logs to store logs from Prow jobs.
module "prow_bucket" {
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
version = "~> 5"
version = "~> 11.1"

name = "kubernetes-ci-logs"
project_id = module.project.project_id
Expand Down Expand Up @@ -173,3 +173,30 @@ resource "google_pubsub_topic" "kubernetes_ci_logs_topic" {
name = "kubernetes-ci-logs-updates"
project = module.project.project_id
}

// Create gs://k8s-security-ci-logs private bucket to store logs from Prow jobs running in
// the kubernetes-security org.
module "prow_security_bucket" {
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
version = "~> 11.1"

name = "k8s-security-ci-logs"
project_id = module.project.project_id
location = "us-central1"
lifecycle_rules = [{
action = {
type = "Delete"
}
condition = {
age = 14 # 14d
with_state = "ANY"
}
}]

iam_members = [
{
role = "roles/storage.objectAdmin"
member = "serviceAccount:${google_service_account.prow.email}"
},
]
}