create staging registry for aws-encryption-provider (#7587)

upodroid · web-flow · commit 1561cd9512fd · 2024-12-06T17:10:00.000Z
* create staging registry for aws-encryption-provider

* bump provider deps

---------

Co-authored-by: upodroid &lt;upodroid@users.noreply.github.com&gt;
diff --git a/infra/gcp/terraform/k8s-staging-images/buckets.tf b/infra/gcp/terraform/k8s-staging-images/buckets.tf
@@ -16,7 +16,7 @@ limitations under the License.
 
 module "gcb_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 5"
+  version = "~> 8.0"
 
   name       = "k8s-staging-images-gcb"
   project_id = module.project.project_id
diff --git a/infra/gcp/terraform/k8s-staging-images/iam.tf b/infra/gcp/terraform/k8s-staging-images/iam.tf
@@ -16,7 +16,7 @@ limitations under the License.
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "~> 7"
+  version = "~> 8"
 
   projects = [module.project.project_id]
 
diff --git a/infra/gcp/terraform/k8s-staging-images/main.tf b/infra/gcp/terraform/k8s-staging-images/main.tf
@@ -16,7 +16,7 @@ limitations under the License.
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.5"
+  version = "~> 17.1"
 
   name            = "k8s-staging-images"
   project_id      = "k8s-staging-images"
diff --git a/infra/gcp/terraform/k8s-staging-images/provider.tf b/infra/gcp/terraform/k8s-staging-images/provider.tf
@@ -25,11 +25,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 5.34.0"
+      version = "~> 6.12.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 5.34.0"
+      version = "~> 6.12.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/k8s-staging-images/registries.tf b/infra/gcp/terraform/k8s-staging-images/registries.tf
@@ -17,17 +17,18 @@ limitations under the License.
 locals {
   // The groups have to be created before applying this terraform code
   registries = {
-    charts               = "group:k8s-infra-release-admins@kubernetes.io"
-    cloud-provider-kind  = "group:k8s-infra-staging-kind@kubernetes.io"
-    etcd-manager         = "group:k8s-infra-staging-etcd-manager@kubernetes.io"
-    ingress-nginx        = "group:k8s-infra-staging-ingress-nginx@kubernetes.io"
-    kind                 = "group:k8s-infra-staging-kind@kubernetes.io"
-    kubernetes           = "group:k8s-infra-staging-kubernetes@kubernetes.io"
-    kueue                = "group:k8s-infra-staging-kueue@kubernetes.io"
-    llm-instance-gateway = "group:sig-apps-leads@kubernetes.io"
-    secrets-store-sync   = "group:k8s-infra-staging-secrets-store-sync@kubernetes.io"
-    test-infra           = "group:k8s-infra-staging-test-infra@kubernetes.io"
-    csi-vsphere          = "group:k8s-infra-staging-csi-vsphere@kubernetes.io"
+    aws-encryption-provider = "group:k8s-infra-staging-provider-aws@kubernetes.io"
+    charts                  = "group:k8s-infra-release-admins@kubernetes.io"
+    cloud-provider-kind     = "group:k8s-infra-staging-kind@kubernetes.io"
+    etcd-manager            = "group:k8s-infra-staging-etcd-manager@kubernetes.io"
+    ingress-nginx           = "group:k8s-infra-staging-ingress-nginx@kubernetes.io"
+    kind                    = "group:k8s-infra-staging-kind@kubernetes.io"
+    kubernetes              = "group:k8s-infra-staging-kubernetes@kubernetes.io"
+    kueue                   = "group:k8s-infra-staging-kueue@kubernetes.io"
+    llm-instance-gateway    = "group:sig-apps-leads@kubernetes.io"
+    secrets-store-sync      = "group:k8s-infra-staging-secrets-store-sync@kubernetes.io"
+    test-infra              = "group:k8s-infra-staging-test-infra@kubernetes.io"
+    csi-vsphere             = "group:k8s-infra-staging-csi-vsphere@kubernetes.io"
   }
 }
 
diff --git a/registry.k8s.io/images/k8s-staging-aws-encryption-provider/OWNERS b/registry.k8s.io/images/k8s-staging-aws-encryption-provider/OWNERS
@@ -0,0 +1,8 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- justinsb
+- micahhausler
+- nckturner
+- wongma7
+- xdu31
diff --git a/registry.k8s.io/images/k8s-staging-aws-encryption-provider/images.yaml b/registry.k8s.io/images/k8s-staging-aws-encryption-provider/images.yaml
diff --git a/registry.k8s.io/manifests/k8s-staging-aws-encryption-provider/promoter-manifest.yaml b/registry.k8s.io/manifests/k8s-staging-aws-encryption-provider/promoter-manifest.yaml
@@ -0,0 +1,48 @@
+# google group for us-central1-docker.pkg.dev/k8s-staging-images/aws-encryption-provider is k8s-infra-staging-provider-aws@kubernetes.io
+registries:
+  - name: us-central1-docker.pkg.dev/k8s-staging-images/aws-encryption-provider
+    src: true
+  - name: asia-east1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: asia-south1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: asia-northeast1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: asia-northeast2-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: australia-southeast1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-north1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-southwest1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west2-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west3-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west4-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west8-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west9-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: europe-west10-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: southamerica-west1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-central1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-east1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-east4-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-east5-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-south1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-west1-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+  - name: us-west2-docker.pkg.dev/k8s-artifacts-prod/images/aws-encryption-provider
+    service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ terraform {`
`25`	`25`	`required_providers {`
`26`	`26`	`google = {`
`27`	`27`	`source = "hashicorp/google"`
`28`		`- version = "~> 5.34.0"`
	`28`	`+ version = "~> 6.12.0"`
`29`	`29`	`}`
`30`	`30`	`google-beta = {`
`31`	`31`	`source = "hashicorp/google-beta"`
`32`		`- version = "~> 5.34.0"`
	`32`	`+ version = "~> 6.12.0"`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
-Original file line number
+Diff line change
 locals {
   // The groups have to be created before applying this terraform code
   registries = {
 -    charts               = "group:[email protected]"
 -    cloud-provider-kind  = "group:[email protected]"
 -    etcd-manager         = "group:[email protected]"
 -    ingress-nginx        = "group:[email protected]"
 -    kind                 = "group:[email protected]"
 -    kubernetes           = "group:[email protected]"
 -    kueue                = "group:[email protected]"
 -    llm-instance-gateway = "group:[email protected]"
 -    secrets-store-sync   = "group:[email protected]"
 -    test-infra           = "group:[email protected]"
 -    csi-vsphere          = "group:[email protected]"
 +    aws-encryption-provider = "group:[email protected]"
 +    charts                  = "group:[email protected]"
 +    cloud-provider-kind     = "group:[email protected]"
 +    etcd-manager            = "group:[email protected]"
 +    ingress-nginx           = "group:[email protected]"
 +    kind                    = "group:[email protected]"
 +    kubernetes              = "group:[email protected]"
 +    kueue                   = "group:[email protected]"
 +    llm-instance-gateway    = "group:[email protected]"
 +    secrets-store-sync      = "group:[email protected]"
 +    test-infra              = "group:[email protected]"
 +    csi-vsphere             = "group:[email protected]"
+  }
+}