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.

Sign up for GitHub

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

Replace k8s.gcr.io with registry.k8s.io #28674

Closed
wants to merge 3 commits into from
Closed

Replace k8s.gcr.io with registry.k8s.io #28674

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc92ca
replaced k8s.gro.io with registry.k8s.io
swastik959 Feb 8, 2023
3a59ea0
replaced rest
swastik959 Feb 9, 2023
81680d0
original
swastik959 Feb 13, 2023
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 config/jobs/image-pushing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ If you need the `.git` directory to be uploaded to your build environment:
- add an empty `.gcloudignore` file to your repository. This will override the
[default values][gcloudignore].

[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md
[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/README.md
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The instructions are still at https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md

Can we please double check that changes are valid instead of mass substituting?

For all references to using/pulling an image, registry.k8s.io contains all images from k8s.gcr.io

For other contexts, they may not be interchangeable.

[gcb documentation]: https://cloud.google.com/cloud-build/docs/configuring-builds/create-basic-configuration
[gcb-docker-gcloud]: https://github.com/kubernetes/test-infra/blob/master/images/gcb-docker-gcloud/Dockerfile
[gcloudignore]: https://cloud.google.com/sdk/gcloud/reference/topic/gcloudignore
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/kops/build_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ def generate_grid():
#############################
def generate_misc():
results = [
# A one-off scenario testing the k8s.gcr.io mirror
# A one-off scenario testing the registry.k8s.io mirror
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

registry.k8s.io is the mirror of k8s.gcr.io referenced here

build_test(name_override="kops-scenario-gcr-mirror",
runs_per_day=24,
cloud="aws",
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ periodics:
testgrid-dashboards: sig-cluster-lifecycle-all
testgrid-tab-name: periodic-manifest-lists
testgrid-alert-email: kubernetes-sig-cluster-lifecycle+testgrid@googlegroups.com
description: "OWNER: sig-cluster-lifecycle; an e2e test for verifying manifest list images at k8s.gcr.io"
description: "OWNER: sig-cluster-lifecycle; an e2e test for verifying manifest list images at registry.k8s.io"
testgrid-num-columns-recent: "20"
testgrid-num-failures-to-alert: "4"
testgrid-alert-stale-results-hours: "48"
6 changes: 3 additions & 3 deletions config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ presubmits:
testgrid-dashboards: sig-k8s-infra-k8sio
decorate: true
skip_report: false
run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert all the changes to this file please? This will break the image promotion jobs right now. I will resolve this as part of the image registry freeze in March.

run_if_changed: 'registry.k8s.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
max_concurrency: 10
branches:
- ^main$
Expand All @@ -19,7 +19,7 @@ presubmits:
- /kpromo
args:
- cip
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/registry.k8s.io
- --use-prow-manifest-diff
resources:
limits:
Expand Down Expand Up @@ -48,7 +48,7 @@ presubmits:
- /kpromo
args:
- cip
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/registry.k8s.io
- --use-prow-manifest-diff
- --vuln-severity-threshold=1
# Check that changes to backup scripts are valid.
Expand Down
6 changes: 3 additions & 3 deletions config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ postsubmits:
decorate: true
decoration_config:
timeout: 4h
run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
run_if_changed: 'registry.k8s.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert all the changes to this file please? This will break the image promotion jobs right now. I will resolve this as part of the image registry freeze in March.

# Never run more than 1 job at a time. This is because we don't want to run
# into a case where an older manifest PR merge gets run last (after a newer
# one).
Expand All @@ -49,7 +49,7 @@ postsubmits:
- /kpromo
args:
- cip
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/registry.k8s.io
- --use-prow-manifest-diff
- --confirm
env:
Expand Down Expand Up @@ -157,7 +157,7 @@ periodics:
- /kpromo
args:
- cip
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/registry.k8s.io
- --confirm
env:
- name: GOMAXPROCS
Expand Down
8 changes: 4 additions & 4 deletions config/jobs/kubernetes/sig-network/ingress-nginx/ingress-nginx-presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ presubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
- image: registry.k8s.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
command:
- ./hack/verify-boilerplate.sh
annotations:
Expand All @@ -30,7 +30,7 @@ presubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
- image: registry.k8s.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
command:
- ./hack/verify-codegen.sh
annotations:
Expand All @@ -47,7 +47,7 @@ presubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
- image: registry.k8s.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
command:
- ./hack/verify-lualint.sh
annotations:
Expand All @@ -66,7 +66,7 @@ presubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
- image: registry.k8s.io/ingress-nginx/e2e-test-runner:v20220823-ge19026fe4@sha256:038fc60379b6ce9a0134c2ff9134edccad1f8ecbd9c6ebed9660711d05b0ed95
command:
- make
- lua-test
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ postsubmits:
spec:
serviceAccountName: pusher
containers:
- image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-1
- image: registry.k8s.io/artifact-promoter/kpromo:v3.3.0-1
command:
- /kpromo
args:
Expand Down
2 changes: 1 addition & 1 deletion config/prow/autobump-config/prow-job-autobump-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ prefixes:
summarise: false
consistentImages: false
- name: "test-infra images"
prefix: "k8s.gcr.io/test-infra"
prefix: "registry.k8s.io/test-infra"
repo: "https://github.com/kubernetes/test-infra"
summarise: false
consistentImages: false
2 changes: 1 addition & 1 deletion config/prow/cluster/kube-state-metrics_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
app.kubernetes.io/version: 2.0.0-alpha.1
spec:
containers:
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:2.0.0-alpha.1
- image: registry.k8s.io/kube-state-metrics/kube-state-metrics:2.0.0-alpha.1
args:
- --metric-allowlist="kube_pod_container_status_restarts_total"
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion experiment/kind-conformance-image-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ run_tests() {

# build and load the conformance image into the kind nodes
make build ARCH=amd64
kind load docker-image k8s.gcr.io/conformance-amd64:${VERSION} ||
kind load docker-image registry.k8s.io/conformance-amd64:${VERSION} ||
kind load docker-image registry.k8s.io/conformance-amd64:${VERSION}

# patch the image in manifest
Expand Down
2 changes: 1 addition & 1 deletion experiment/print-job-image-summary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $(for i in $(image_include_exclude "gcr\.io/k8s-staging-test-infra" "^$" true |
" - %-43s %s\n" "${i}" "$(image_include_exclude "gcr\.io/k8s-staging-test-infra/${i}" "^$")"; \
done | sort -k3 -rg)
- k8s-staging-the_rest $(image_include_exclude "gcr\.io/k8s-staging" "test-infra")
- k8s.gcr.io $(image_include_exclude "k8s\.gcr\.io" "^$")
- registry.k8s.io $(image_include_exclude "registry\.k8s\.io" "^$")
- google.com gcp org
- k8s-prow $(image_include_exclude "gcr\.io/k8s-prow" "^$")
- k8s-testimages $(image_include_exclude "gcr\.io/k8s-testimages" "^$")
Expand Down
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/config-systemd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ oom_score = -999

# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
# See: https://github.com/kubernetes/k8s.io/issues/3411
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
swastik959 marked this conversation as resolved.
Show resolved Hide resolved
endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]


2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ oom_score = -999

# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
# See: https://github.com/kubernetes/k8s.io/issues/3411
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
swastik959 marked this conversation as resolved.
Show resolved Hide resolved
endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
2 changes: 1 addition & 1 deletion label_sync/labels.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ larger set of contributors to apply/remove them.
| <a id="area/infra/aws" href="#area/infra/aws">`area/infra/aws`</a> | Issues or PRs related to Kubernetes AWS infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/infra/monitoring" href="#area/infra/monitoring">`area/infra/monitoring`</a> | REMOVING. This will be deleted after 2021-08-04 00:00:00 +0000 UTC <br><br> Issues or PRs related to monitoring of the Kubernetes project infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/infra/reliability" href="#area/infra/reliability">`area/infra/reliability`</a> | REMOVING. This will be deleted after 2021-08-04 00:00:00 +0000 UTC <br><br> Issues or PR related to reliability of the Kubernetes project infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/k8s.gcr.io" href="#area/k8s.gcr.io">`area/k8s.gcr.io`</a> | Code in k8s.gcr.io/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/registry.k8s.io" href="#area/registry.k8s.io">`area/registry.k8s.io`</a> | Code in registry.k8s.io/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/policy" href="#area/policy">`area/policy`</a> | Crafting policy, policy decisions, code in policy/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/prow" href="#area/prow">`area/prow`</a> | Setting up or working with prow in general, prow.k8s.io, prow build clusters| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
| <a id="area/release-eng" href="#area/release-eng">`area/release-eng`</a> | Issues or PRs related to the Release Engineering subproject| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) |
Expand Down
4 changes: 2 additions & 2 deletions label_sync/labels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,8 +1022,8 @@ repos:
prowPlugin: label
addedBy: anyone
- color: 0052cc
description: Code in k8s.gcr.io/
name: area/k8s.gcr.io
description: Code in registry.k8s.io/
name: area/registry.k8s.io
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this be a rename or issues will drop the labels: https://github.com/kubernetes/k8s.io/labels/area%2Fk8s.gcr.io ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should do that. We should probably add a new label. cc @kubernetes/release-engineering @kubernetes/sig-k8s-infra

target: both
prowPlugin: label
addedBy: anyone
Expand Down
2 changes: 1 addition & 1 deletion prow/cmd/phony/examples/review_approve_submitted.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions prow/test/integration/config/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ spec:
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c
image: registry.k8s.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -582,7 +582,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
imagePullPolicy: IfNotPresent
name: create
securityContext:
Expand Down Expand Up @@ -638,7 +638,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
imagePullPolicy: IfNotPresent
name: patch
securityContext:
Expand Down