Skip to content

Commit

Permalink
Merge pull request #1441 from justaugustus/docker-mirror
Browse files Browse the repository at this point in the history
Establish a staging repository for mirroring Docker Hub images
  • Loading branch information
k8s-ci-robot authored Nov 20, 2020
2 parents dcc9671 + 7542949 commit 67735e4
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 0 deletions.
5 changes: 5 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ aliases:
- nikhita
- parispittman
## BEGIN CUSTOM CONTENT
build-admins:
- amwat
- BenTheElder
- MushuEE
- spiffxp
build-image-approvers:
- BenTheElder
- cblecker
Expand Down
33 changes: 33 additions & 0 deletions groups/sig-release/groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ groups:
- [email protected] # 1.20 Bug Triage Shadow
- [email protected] # 1.20 Bug Triage Lead

- email-id: [email protected]
name: k8s-infra-google-build-admins
description: |-
ACL for Google Build Admins (edit access to Docker Hub mirror, view
access to Release GCP projects)
https://git.k8s.io/sig-release/release-managers.md#build-admins
settings:
ReconcileMembers: "true"
members:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]

- email-id: [email protected]
name: k8s-infra-release-admins
description: |-
Expand Down Expand Up @@ -59,6 +75,7 @@ groups:
ReconcileMembers: "true"
members:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
Expand Down Expand Up @@ -150,6 +167,22 @@ groups:
members:
- [email protected]

- email-id: [email protected]
name: k8s-infra-staging-mirror
description: |-
ACL for staging mirror images
This project is used to stage images mirrored from Docker Hub.
settings:
ReconcileMembers: "true"
members:
- [email protected]
- [email protected]
- [email protected] # wg-k8s-infra-oncall
- [email protected] # wg-k8s-infra-oncall
- [email protected] # wg-k8s-infra-oncall
- [email protected] # wg-k8s-infra-oncall

- email-id: [email protected]
name: k8s-infra-staging-releng
description: |-
Expand Down
2 changes: 2 additions & 0 deletions infra/gcp/ensure-staging-storage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ STAGING_PROJECTS=(
kubernetes
kustomize
metrics-server
mirror
multitenancy
networking
nfd
Expand All @@ -106,6 +107,7 @@ STAGING_PROJECTS=(

RELEASE_STAGING_PROJECTS=(
kubernetes
mirror
releng
)

Expand Down
16 changes: 16 additions & 0 deletions k8s.gcr.io/images/k8s-staging-mirror/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See the OWNERS docs at https://go.k8s.io/owners

options:
no_parent_owners: true
approvers:
- sig-release-leads
- sig-testing-leads
- release-engineering-approvers
- wg-k8s-infra-leads
- build-admins
reviewers:
- release-engineering-reviewers

labels:
- sig/release
- area/release-eng
1 change: 1 addition & 0 deletions k8s.gcr.io/images/k8s-staging-mirror/images.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# NO IMAGES YET
10 changes: 10 additions & 0 deletions k8s.gcr.io/manifests/k8s-staging-mirror/promoter-manifest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# google group for gcr.io/k8s-staging-mirror is [email protected]
registries:
- name: gcr.io/k8s-staging-mirror
src: true
- name: us.gcr.io/k8s-artifacts-prod/mirror
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
- name: eu.gcr.io/k8s-artifacts-prod/mirror
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
- name: asia.gcr.io/k8s-artifacts-prod/mirror
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com

0 comments on commit 67735e4

Please sign in to comment.