Skip to content

Commit d95cf8b

Browse files
committed
reconcile infra diff
1 parent f307a12 commit d95cf8b

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

infra/gcp/terraform/k8s-infra-prow/buckets.tf

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,15 @@ module "prow_bucket" {
9090
name = "kubernetes-ci-logs"
9191
project_id = module.project.project_id
9292
location = "us-central1"
93-
94-
# TODO: BenTheElder, what lifecycle policy do we have on the previous bucket
95-
# lifecycle_rules = [{
96-
# action = {
97-
# type = "Delete"
98-
# }
99-
# condition = {
100-
# age = 90 # 90d
101-
# with_state = "ANY"
102-
# }
103-
# }]
93+
lifecycle_rules = [{
94+
action = {
95+
type = "Delete"
96+
}
97+
condition = {
98+
age = 90 # 90d
99+
with_state = "ANY"
100+
}
101+
}]
104102

105103
iam_members = [
106104
{

infra/gcp/terraform/k8s-infra-prow/iam.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ resource "google_pubsub_topic_iam_binding" "read_binding" {
140140
}
141141

142142
# https://cloud.google.com/iam/docs/workload-identity-federation-with-kubernetes#kubernetes
143+
# This is a community owned K8s Cluster inside IBM Cloud, have a look at the infra/ibm/terraform folder for more details
143144
resource "google_iam_workload_identity_pool" "ibm_clusters" {
144145
project = module.project.project_id
145146
workload_identity_pool_id = "ibm-clusters"

0 commit comments

Comments
 (0)