Merge pull request #7513 from borg-land/promote-cloud-provider-kind

k8s-ci-robot · web-flow · commit 776332c7dd3e · 2024-11-12T20:56:46.000Z
Promote cloud provider kind correctly
diff --git a/infra/gcp/terraform/k8s-staging-images/registries.tf b/infra/gcp/terraform/k8s-staging-images/registries.tf
@@ -17,13 +17,15 @@ 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"
-    etcd-manager       = "group:k8s-infra-staging-etcd-manager@kubernetes.io",
-    kubernetes         = "group:k8s-infra-staging-kubernetes@kubernetes.io",
-    kueue              = "group:k8s-infra-staging-kueue@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"
+    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",
+    kind                = "group:k8s-infra-staging-kind@kubernetes.io"
+    kubernetes          = "group:k8s-infra-staging-kubernetes@kubernetes.io",
+    kueue               = "group:k8s-infra-staging-kueue@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-cloud-provider-kind/OWNERS b/registry.k8s.io/images/k8s-staging-cloud-provider-kind/OWNERS
diff --git a/registry.k8s.io/images/k8s-staging-cloud-provider-kind/images.yaml b/registry.k8s.io/images/k8s-staging-cloud-provider-kind/images.yaml
@@ -1,3 +1,3 @@
-- name: cloud-provider-kind
+- name: cloud-controller-manager
   dmap:
     "sha256:cacb2da53a0d3b363bf53f11c9e0f714d7605471130a43ae7d1e161da0c3cbdb": ["v0.4.0"]
diff --git a/registry.k8s.io/manifests/k8s-staging-cloud-provider-kind/promoter-manifest.yaml b/registry.k8s.io/manifests/k8s-staging-cloud-provider-kind/promoter-manifest.yaml
@@ -0,0 +1,48 @@
+# google group for us-central1-docker.pkg.dev/k8s-staging-images/cloud-provider-kind is k8s-infra-staging-kind@kubernetes.io
+registries:
+- name: us-central1-docker.pkg.dev/k8s-staging-images/cloud-provider-kind
+  src: true
+- name: asia-east1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: asia-south1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: asia-northeast1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: asia-northeast2-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: australia-southeast1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-north1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-southwest1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west2-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west3-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west4-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west8-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west9-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: europe-west10-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: southamerica-west1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-central1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-east1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-east4-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-east5-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-south1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-west1-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
+- name: us-west2-docker.pkg.dev/k8s-artifacts-prod/images/cloud-provider-kind
+  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com

-Original file line number
+Diff line change
 locals {
   // The groups have to be created before applying this terraform code
   registries = {
 -    charts             = "group:[email protected]"
 -    etcd-manager       = "group:[email protected]",
 -    kubernetes         = "group:[email protected]",
 -    kueue              = "group:[email protected]"
 -    secrets-store-sync = "group:[email protected]"
 -    test-infra         = "group:[email protected]"
 -    csi-vsphere        = "group:[email protected]"
 +    charts              = "group:[email protected]"
 +    cloud-provider-kind = "group:[email protected]"
 +    etcd-manager        = "group:[email protected]",
 +    kind                = "group:[email protected]"
 +    kubernetes          = "group:[email protected]",
 +    kueue               = "group:[email protected]"
 +    secrets-store-sync  = "group:[email protected]"
 +    test-infra          = "group:[email protected]"
 +    csi-vsphere         = "group:[email protected]"
+  }
+}