-
Notifications
You must be signed in to change notification settings - Fork 919
releng: Add new projects for staging/releasing Kubernetes #624
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -733,6 +733,18 @@ groups: | |
- [email protected] | ||
- [email protected] | ||
|
||
- email-id: [email protected] | ||
name: k8s-infra-staging-kubernetes | ||
description: |- | ||
ACL for staging Kubernetes | ||
|
||
This project is used to stage official Kubernetes release artifacts. | ||
settings: | ||
ReconcileMembers: "true" | ||
members: | ||
# TODO(justaugustus): Add editors group after k8s.gcr.io domain flip | ||
- [email protected] | ||
|
||
- email-id: [email protected] | ||
name: k8s-infra-staging-kube-state-metrics | ||
description: |- | ||
|
@@ -814,13 +826,24 @@ groups: | |
settings: | ||
ReconcileMembers: "true" | ||
members: | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
- [email protected] | ||
|
||
- email-id: [email protected] | ||
name: k8s-infra-staging-releng | ||
description: |- | ||
ACL for staging RelEng | ||
|
||
This project is used to test and stage Release Engineering tooling. | ||
settings: | ||
ReconcileMembers: "true" | ||
members: | ||
- [email protected] | ||
- [email protected] | ||
|
||
- email-id: [email protected] | ||
name: k8s-infra-staging-scl-image-builder | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -190,8 +190,12 @@ empower_service_account_for_cip_auditor_e2e_tester \ | |
$(svc_acct_email "${GCR_AUDIT_TEST_PROD_PROJECT}" "${PROMOTER_SVCACCT}") \ | ||
"${GCR_AUDIT_TEST_PROD_PROJECT}" | ||
|
||
# Special case: grant the release tools testing group access to their fake | ||
# Special case: grant the Release Managers group access to their fake | ||
# prod project. | ||
empower_group_to_fake_prod \ | ||
"${RELEASE_TESTPROD_PROJECT}" \ | ||
"[email protected]" | ||
|
||
empower_group_to_fake_prod \ | ||
"${RELEASE_TESTPROD_PROJECT}" \ | ||
"[email protected]" | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
#!/usr/bin/env bash | ||
# | ||
# Copyright 2019 The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# This script is used to ensure Release Engineering subproject owners have the | ||
# appropriate access to SIG Release prod GCP projects. | ||
# | ||
# Projects: | ||
# - k8s-releng-prod - Stores KMS objects which other release projects will | ||
# be granted permission to decrypt e.g., GITHUB_TOKEN | ||
|
||
set -o errexit | ||
set -o nounset | ||
set -o pipefail | ||
|
||
SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}") | ||
. "${SCRIPT_DIR}/lib.sh" | ||
|
||
function usage() { | ||
echo "usage: $0 [project...]" > /dev/stderr | ||
echo "example:" > /dev/stderr | ||
echo " $0 # do all release projects" > /dev/stderr | ||
echo " $0 k8s-releng-prod # just do one" > /dev/stderr | ||
echo > /dev/stderr | ||
} | ||
|
||
# NB: Please keep this sorted. | ||
PROJECTS=( | ||
k8s-releng-prod | ||
) | ||
|
||
if [ $# = 0 ]; then | ||
# default to all release projects | ||
set -- "${PROJECTS[@]}" | ||
fi | ||
|
||
for PROJECT; do | ||
color 3 "Configuring: ${PROJECT}" | ||
|
||
# Make the project, if needed | ||
color 6 "Ensuring project exists: ${PROJECT}" | ||
ensure_project "${PROJECT}" | ||
|
||
# Enable admins to use the UI | ||
color 6 "Empowering ${RELEASE_ADMINS} as project viewers" | ||
empower_group_as_viewer "${PROJECT}" "${RELEASE_ADMINS}" | ||
|
||
# Enable KMS APIs | ||
color 6 "Enabling the KMS API" | ||
enable_api "${PROJECT}" cloudkms.googleapis.com | ||
|
||
# Let project admins use KMS. | ||
color 6 "Empowering ${RELEASE_ADMINS} as KMS admins" | ||
empower_group_for_kms "${PROJECT}" "${RELEASE_ADMINS}" | ||
|
||
color 6 "Done" | ||
done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,6 +57,14 @@ PROW_SVCACCT="[email protected]" | |
GCP_ORG="758905017065" # kubernetes.io | ||
GCP_BILLING="018801-93540E-22A20E" | ||
|
||
# Release Engineering umbrella groups | ||
# - admins - edit and KMS access (Release Engineering subproject owners) | ||
# - managers - access to run stage/release jobs (Patch Release Team / Branch Managers) | ||
# - viewers - view access to Release Engineering projects (Release Manager Associates) | ||
RELEASE_ADMINS="[email protected]" | ||
RELEASE_MANAGERS="[email protected]" | ||
RELEASE_VIEWERS="[email protected]" | ||
|
||
# Get the GCS bucket name that backs a GCR repo. | ||
# $1: The GCR repo (same as the GCP project name) | ||
# $2: The GCR region (optional) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: | ||
- release-engineering-approvers | ||
- cblecker | ||
- dims | ||
- listx | ||
- thockin | ||
reviewers: | ||
- release-engineering-reviewers | ||
|
||
labels: | ||
- sig/release | ||
- area/release-eng |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
### ATTENTION ### | ||
# k8s-staging-kubernetes is the staging container registry for ROOT level k8s.gcr.io images. | ||
# Image promotion for this project is restricted to Release Managers. | ||
# | ||
# The following images are managed within this project: | ||
# - cloud-controller-manager | ||
# - conformance (will likely be moved to another staging project) | ||
# - hyperkube (to be deprecated in a future release) | ||
# - kube-apiserver | ||
# - kube-controller-manager | ||
# - kube-proxy | ||
# - kube-scheduler |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: | ||
- release-engineering-approvers | ||
- cblecker | ||
- dims | ||
- listx | ||
- thockin | ||
reviewers: | ||
- release-engineering-reviewers | ||
|
||
labels: | ||
- sig/release | ||
- area/release-eng |
Empty file.
23 changes: 23 additions & 0 deletions
23
k8s.gcr.io/manifests/k8s-staging-kubernetes/promoter-manifest.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
### ATTENTION ### | ||
# k8s-staging-kubernetes is the staging container registry for ROOT level k8s.gcr.io images. | ||
# Image promotion for this project is restricted to Release Managers. | ||
# | ||
# The following images are managed within this project: | ||
# - cloud-controller-manager | ||
# - conformance (will likely be moved to another staging project) | ||
# - hyperkube (to be deprecated in a future release) | ||
# - kube-apiserver | ||
# - kube-controller-manager | ||
# - kube-proxy | ||
# - kube-scheduler | ||
# | ||
# google group for gcr.io/k8s-staging-kubernetes is [email protected] | ||
registries: | ||
- name: gcr.io/k8s-staging-kubernetes | ||
src: true | ||
- name: us.gcr.io/k8s-artifacts-prod | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com | ||
- name: eu.gcr.io/k8s-artifacts-prod | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com | ||
- name: asia.gcr.io/k8s-artifacts-prod | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com |
10 changes: 10 additions & 0 deletions
10
k8s.gcr.io/manifests/k8s-staging-releng/promoter-manifest.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# google group for gcr.io/k8s-staging-releng is [email protected] | ||
registries: | ||
- name: gcr.io/k8s-staging-releng | ||
src: true | ||
- name: us.gcr.io/k8s-artifacts-prod/releng | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com | ||
- name: eu.gcr.io/k8s-artifacts-prod/releng | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com | ||
- name: asia.gcr.io/k8s-artifacts-prod/releng | ||
service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.