Skip to content
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

create staging registry for aws-encryption-provider #7587

Merged
merged 2 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/gcp/terraform/k8s-staging-images/buckets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/gcp/terraform/k8s-staging-images/iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion infra/gcp/terraform/k8s-staging-images/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions infra/gcp/terraform/k8s-staging-images/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
23 changes: 12 additions & 11 deletions infra/gcp/terraform/k8s-staging-images/registries.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# See the OWNERS docs at https://go.k8s.io/owners

approvers:
- justinsb
- micahhausler
- nckturner
- wongma7
- xdu31
Empty file.
Original file line number Diff line number Diff line change
@@ -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