From 13ec5df297836330a72235b81e939512812c31ec Mon Sep 17 00:00:00 2001 From: kmova Date: Mon, 8 Jun 2020 15:45:48 +0000 Subject: [PATCH 1/6] add staging project for K8s storage we'll be using this to move our existing container images generated by kubernetes incubator. The projects are being shifted from kubernetes incubator to kubernetes-sigs and as part of this migration, we will start using the new image registeries maintained by community infra with GCB + GCS Ref: https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner/pull/2 Signed-off-by: kmova --- groups/groups.yaml | 16 ++++++++++++++++ infra/gcp/ensure-staging-storage.sh | 1 + k8s.gcr.io/images/k8s-staging-storage/OWNERS | 14 ++++++++++++++ .../images/k8s-staging-storage/images.yaml | 1 + .../k8s-staging-storage/promoter-manifest.yaml | 10 ++++++++++ 5 files changed, 42 insertions(+) create mode 100644 k8s.gcr.io/images/k8s-staging-storage/OWNERS create mode 100644 k8s.gcr.io/images/k8s-staging-storage/images.yaml create mode 100644 k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml diff --git a/groups/groups.yaml b/groups/groups.yaml index e34659d123f..bd6911f1018 100644 --- a/groups/groups.yaml +++ b/groups/groups.yaml @@ -372,6 +372,22 @@ groups: members: - bentheelder@google.com + - email-id: k8s-infra-staging-storage@kubernetes.io + name: k8s-infra-staging-storage + description: |- + ACL for staging K8s Storage artifacts + settings: + ReconcileMembers: "true" + members: + - davanum@gmail.com + - saadali@google.com + - msau@google.com + - xingyang105@gmail.com + - jsafrane@redhat.com + - mattwon@amazon.com + - kiran.mova@mayadata.io + - hchiramm@redhat.com + # # RBAC groups: k8s-infra-rbac-* # diff --git a/infra/gcp/ensure-staging-storage.sh b/infra/gcp/ensure-staging-storage.sh index fdd8be46d7d..783ea897a84 100755 --- a/infra/gcp/ensure-staging-storage.sh +++ b/infra/gcp/ensure-staging-storage.sh @@ -84,6 +84,7 @@ STAGING_PROJECTS=( scl-image-builder service-apis slack-infra + storage txtdirect ) diff --git a/k8s.gcr.io/images/k8s-staging-storage/OWNERS b/k8s.gcr.io/images/k8s-staging-storage/OWNERS new file mode 100644 index 00000000000..af486f2a48f --- /dev/null +++ b/k8s.gcr.io/images/k8s-staging-storage/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +# Current set of people in sig-storage-leads from +# https://github.com/kubernetes/community/blob/master/OWNERS_ALIASES. +approvers: +- jsafrane +- msau42 +- saad-ali +- xing-yang + +reviwers: +- wongma7 +- kmova +- humblec diff --git a/k8s.gcr.io/images/k8s-staging-storage/images.yaml b/k8s.gcr.io/images/k8s-staging-storage/images.yaml new file mode 100644 index 00000000000..6c9ba904fc9 --- /dev/null +++ b/k8s.gcr.io/images/k8s-staging-storage/images.yaml @@ -0,0 +1 @@ +# No images yet \ No newline at end of file diff --git a/k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml b/k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml new file mode 100644 index 00000000000..a93d333cd38 --- /dev/null +++ b/k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml @@ -0,0 +1,10 @@ +# google group for gcr.io/k8s-staging-storage is k8s-infra-staging-storage@kubernetes.io +registries: +- name: gcr.io/k8s-staging-storage + src: true +- name: us.gcr.io/k8s-artifacts-prod/storage + service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com +- name: eu.gcr.io/k8s-artifacts-prod/storage + service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com +- name: asia.gcr.io/k8s-artifacts-prod/storage + service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com From be5d01cfc0f31aeea6dfb6c9b50e32ac1f92a15d Mon Sep 17 00:00:00 2001 From: kmova Date: Mon, 8 Jun 2020 16:55:41 +0000 Subject: [PATCH 2/6] update email address for humblec Signed-off-by: kmova --- groups/groups.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groups/groups.yaml b/groups/groups.yaml index bd6911f1018..c5d3a06c5b4 100644 --- a/groups/groups.yaml +++ b/groups/groups.yaml @@ -386,7 +386,7 @@ groups: - jsafrane@redhat.com - mattwon@amazon.com - kiran.mova@mayadata.io - - hchiramm@redhat.com + - humble.devassy@gmail.com # # RBAC groups: k8s-infra-rbac-* From d3e76af3a151db0b13dbfde09cfb05b9b37e8080 Mon Sep 17 00:00:00 2001 From: kmova Date: Tue, 9 Jun 2020 10:04:09 +0000 Subject: [PATCH 3/6] rename storage to sig-storage Signed-off-by: kmova --- groups/groups.yaml | 6 +++--- infra/gcp/ensure-staging-storage.sh | 2 +- .../{k8s-staging-storage => k8s-staging-sig-storage}/OWNERS | 2 +- k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml | 1 + k8s.gcr.io/images/k8s-staging-storage/images.yaml | 1 - .../promoter-manifest.yaml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename k8s.gcr.io/images/{k8s-staging-storage => k8s-staging-sig-storage}/OWNERS (95%) create mode 100644 k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml delete mode 100644 k8s.gcr.io/images/k8s-staging-storage/images.yaml rename k8s.gcr.io/manifests/{k8s-staging-storage => k8s-staging-sig-storage}/promoter-manifest.yaml (75%) diff --git a/groups/groups.yaml b/groups/groups.yaml index c5d3a06c5b4..07085237226 100644 --- a/groups/groups.yaml +++ b/groups/groups.yaml @@ -372,10 +372,10 @@ groups: members: - bentheelder@google.com - - email-id: k8s-infra-staging-storage@kubernetes.io - name: k8s-infra-staging-storage + - email-id: k8s-infra-staging-sig-storage@kubernetes.io + name: k8s-infra-staging-sig-storage description: |- - ACL for staging K8s Storage artifacts + ACL for staging sig storage artifacts settings: ReconcileMembers: "true" members: diff --git a/infra/gcp/ensure-staging-storage.sh b/infra/gcp/ensure-staging-storage.sh index 783ea897a84..57963a3d895 100755 --- a/infra/gcp/ensure-staging-storage.sh +++ b/infra/gcp/ensure-staging-storage.sh @@ -84,7 +84,7 @@ STAGING_PROJECTS=( scl-image-builder service-apis slack-infra - storage + sig-storage txtdirect ) diff --git a/k8s.gcr.io/images/k8s-staging-storage/OWNERS b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS similarity index 95% rename from k8s.gcr.io/images/k8s-staging-storage/OWNERS rename to k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS index af486f2a48f..3643447de69 100644 --- a/k8s.gcr.io/images/k8s-staging-storage/OWNERS +++ b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS @@ -8,7 +8,7 @@ approvers: - saad-ali - xing-yang -reviwers: +reviewers: - wongma7 - kmova - humblec diff --git a/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml b/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml new file mode 100644 index 00000000000..d48c82d0a75 --- /dev/null +++ b/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml @@ -0,0 +1 @@ +# No images yet diff --git a/k8s.gcr.io/images/k8s-staging-storage/images.yaml b/k8s.gcr.io/images/k8s-staging-storage/images.yaml deleted file mode 100644 index 6c9ba904fc9..00000000000 --- a/k8s.gcr.io/images/k8s-staging-storage/images.yaml +++ /dev/null @@ -1 +0,0 @@ -# No images yet \ No newline at end of file diff --git a/k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml b/k8s.gcr.io/manifests/k8s-staging-sig-storage/promoter-manifest.yaml similarity index 75% rename from k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml rename to k8s.gcr.io/manifests/k8s-staging-sig-storage/promoter-manifest.yaml index a93d333cd38..6647b3ab870 100644 --- a/k8s.gcr.io/manifests/k8s-staging-storage/promoter-manifest.yaml +++ b/k8s.gcr.io/manifests/k8s-staging-sig-storage/promoter-manifest.yaml @@ -1,6 +1,6 @@ -# google group for gcr.io/k8s-staging-storage is k8s-infra-staging-storage@kubernetes.io +# google group for gcr.io/k8s-staging-sig-storage is k8s-infra-staging-sig-storage@kubernetes.io registries: -- name: gcr.io/k8s-staging-storage +- name: gcr.io/k8s-staging-sig-storage src: true - name: us.gcr.io/k8s-artifacts-prod/storage service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com From 16880cd6fefe0e9e864f02d86fb0734e1c95977d Mon Sep 17 00:00:00 2001 From: kmova Date: Tue, 9 Jun 2020 12:45:40 +0000 Subject: [PATCH 4/6] add pohly to sig storage group Signed-off-by: kmova --- groups/groups.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/groups/groups.yaml b/groups/groups.yaml index 07085237226..275d3f3fd77 100644 --- a/groups/groups.yaml +++ b/groups/groups.yaml @@ -387,6 +387,7 @@ groups: - mattwon@amazon.com - kiran.mova@mayadata.io - humble.devassy@gmail.com + - patrick.ohly@intel.com # # RBAC groups: k8s-infra-rbac-* From 2a8230161dfc5f622083e8016ad578fc3d2424f9 Mon Sep 17 00:00:00 2001 From: kmova Date: Tue, 9 Jun 2020 14:32:03 +0000 Subject: [PATCH 5/6] remove self from owners for now Signed-off-by: kmova --- k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS index 3643447de69..1a6b02a7868 100644 --- a/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS +++ b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS @@ -10,5 +10,4 @@ approvers: reviewers: - wongma7 -- kmova - humblec From fbefa62dfdef5d84de9b4cd5d2bf0f2187d839f6 Mon Sep 17 00:00:00 2001 From: kmova Date: Wed, 10 Jun 2020 02:49:03 +0000 Subject: [PATCH 6/6] add pohly to sig-storage reviewers Signed-off-by: kmova --- k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS index 1a6b02a7868..3505fd44f36 100644 --- a/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS +++ b/k8s.gcr.io/images/k8s-staging-sig-storage/OWNERS @@ -11,3 +11,4 @@ approvers: reviewers: - wongma7 - humblec +- pohly