From cfc92cab1a218064f5d73fcb1bd004c024a29ec9 Mon Sep 17 00:00:00 2001 From: Swastik_Gour Date: Wed, 8 Feb 2023 10:20:31 +0530 Subject: [PATCH 1/3] replaced k8s.gro.io with registry.k8s.io --- config/prow/cluster/kube-state-metrics_deployment.yaml | 2 +- experiment/kind-conformance-image-e2e.sh | 2 +- experiment/print-job-image-summary.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/prow/cluster/kube-state-metrics_deployment.yaml b/config/prow/cluster/kube-state-metrics_deployment.yaml index b1548178400f..9f8ee8cc6099 100644 --- a/config/prow/cluster/kube-state-metrics_deployment.yaml +++ b/config/prow/cluster/kube-state-metrics_deployment.yaml @@ -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: diff --git a/experiment/kind-conformance-image-e2e.sh b/experiment/kind-conformance-image-e2e.sh index c077c99fa069..d168d6f30279 100755 --- a/experiment/kind-conformance-image-e2e.sh +++ b/experiment/kind-conformance-image-e2e.sh @@ -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 diff --git a/experiment/print-job-image-summary.sh b/experiment/print-job-image-summary.sh index 2dd1c57cdf6a..ff30b201e207 100755 --- a/experiment/print-job-image-summary.sh +++ b/experiment/print-job-image-summary.sh @@ -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" "^$") From 3a59ea02d287fd55d2873977a3266a36ce4aef14 Mon Sep 17 00:00:00 2001 From: Swastik_Gour Date: Thu, 9 Feb 2023 18:36:33 +0530 Subject: [PATCH 2/3] replaced rest --- config/jobs/image-pushing/README.md | 2 +- config/jobs/kubernetes/kops/build_jobs.py | 2 +- .../jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml | 2 +- .../releng/artifact-promotion-presubmits.yaml | 6 +++--- .../sig-k8s-infra/trusted/releng/releng-trusted.yaml | 6 +++--- .../ingress-nginx/ingress-nginx-presubmit.yaml | 8 ++++---- config/jobs/kubernetes/test-infra/test-infra-trusted.yaml | 2 +- config/prow/autobump-config/prow-job-autobump-config.yaml | 2 +- jobs/e2e_node/containerd/config-systemd.toml | 2 +- jobs/e2e_node/containerd/config.toml | 2 +- label_sync/labels.md | 2 +- label_sync/labels.yaml | 4 ++-- prow/cmd/phony/examples/review_approve_submitted.json | 2 +- prow/test/integration/config/nginx.yaml | 6 +++--- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/jobs/image-pushing/README.md b/config/jobs/image-pushing/README.md index 0bfb4ba491c3..dd52cdbf1e3b 100644 --- a/config/jobs/image-pushing/README.md +++ b/config/jobs/image-pushing/README.md @@ -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 [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 diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index a87177ef733a..ba82ca537350 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -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 build_test(name_override="kops-scenario-gcr-mirror", runs_per_day=24, cloud="aws", diff --git a/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml b/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml index 72aca5835eb6..f23ac1496116 100644 --- a/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml +++ b/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml @@ -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" diff --git a/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml b/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml index 8d8c4fd40f7b..e1aa18b02dec 100644 --- a/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml +++ b/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml @@ -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))' + run_if_changed: 'registry.k8s.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))' max_concurrency: 10 branches: - ^main$ @@ -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: @@ -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. diff --git a/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml b/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml index a726cdb5f569..1f3f5fdc1e79 100644 --- a/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml +++ b/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml @@ -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))' # 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). @@ -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: @@ -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 diff --git a/config/jobs/kubernetes/sig-network/ingress-nginx/ingress-nginx-presubmit.yaml b/config/jobs/kubernetes/sig-network/ingress-nginx/ingress-nginx-presubmit.yaml index d56ffa0c83f3..112995473dc3 100644 --- a/config/jobs/kubernetes/sig-network/ingress-nginx/ingress-nginx-presubmit.yaml +++ b/config/jobs/kubernetes/sig-network/ingress-nginx/ingress-nginx-presubmit.yaml @@ -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: @@ -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: @@ -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: @@ -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 diff --git a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml index c9c979aa718c..8c1a4e41ca39 100644 --- a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml +++ b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml @@ -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: diff --git a/config/prow/autobump-config/prow-job-autobump-config.yaml b/config/prow/autobump-config/prow-job-autobump-config.yaml index c1d2b16b1d93..f05edbc2ecf4 100644 --- a/config/prow/autobump-config/prow-job-autobump-config.yaml +++ b/config/prow/autobump-config/prow-job-autobump-config.yaml @@ -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 diff --git a/jobs/e2e_node/containerd/config-systemd.toml b/jobs/e2e_node/containerd/config-systemd.toml index 20113ccc2b5c..4a717fb064f1 100644 --- a/jobs/e2e_node/containerd/config-systemd.toml +++ b/jobs/e2e_node/containerd/config-systemd.toml @@ -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"] endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",] diff --git a/jobs/e2e_node/containerd/config.toml b/jobs/e2e_node/containerd/config.toml index ac37df749a6f..b7dae29c3151 100644 --- a/jobs/e2e_node/containerd/config.toml +++ b/jobs/e2e_node/containerd/config.toml @@ -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"] endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",] diff --git a/label_sync/labels.md b/label_sync/labels.md index 18a82378845a..e8b1f9d840f9 100644 --- a/label_sync/labels.md +++ b/label_sync/labels.md @@ -383,7 +383,7 @@ larger set of contributors to apply/remove them. | `area/infra/aws` | Issues or PRs related to Kubernetes AWS infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | | `area/infra/monitoring` | REMOVING. This will be deleted after 2021-08-04 00:00:00 +0000 UTC

Issues or PRs related to monitoring of the Kubernetes project infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | | `area/infra/reliability` | REMOVING. This will be deleted after 2021-08-04 00:00:00 +0000 UTC

Issues or PR related to reliability of the Kubernetes project infrastructure| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | -| `area/k8s.gcr.io` | Code in k8s.gcr.io/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | +| `area/registry.k8s.io` | Code in registry.k8s.io/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | | `area/policy` | Crafting policy, policy decisions, code in policy/| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | | `area/prow` | 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) | | `area/release-eng` | Issues or PRs related to the Release Engineering subproject| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | diff --git a/label_sync/labels.yaml b/label_sync/labels.yaml index a3e702debcaf..5507e62a8eb1 100644 --- a/label_sync/labels.yaml +++ b/label_sync/labels.yaml @@ -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 target: both prowPlugin: label addedBy: anyone diff --git a/prow/cmd/phony/examples/review_approve_submitted.json b/prow/cmd/phony/examples/review_approve_submitted.json index af8d31c0841a..00152ad32999 100644 --- a/prow/cmd/phony/examples/review_approve_submitted.json +++ b/prow/cmd/phony/examples/review_approve_submitted.json @@ -155,7 +155,7 @@ } }, "diff_url": "https://github.com/kubernetes/kubernetes/pull/66686.diff", - "body": "\r\n\r\n**What this PR does / why we need it**:\r\nIn our e2e test suite we have use an image \"k8s.gcr.io/e2e-test-images:k8s-aggregator-sample-apiserver:1.7v2\". We need a way to build a fresh image that can we can use instead of that one. Especially we need one that has a multi-arch fat manifest so e2e tests can be run across multiple architectures.\r\n\r\nThis is especially important since we are in the process of promoting the test in question to the conformance suite - https://github.com/kubernetes/kubernetes/pull/63947\r\n\r\n**Which issue(s) this PR fixes** *(optional, in `fixes #(, fixes #, ...)` format, will close the issue(s) when PR gets merged)*:\r\nFixes #\r\n\r\n**Special notes for your reviewer**:\r\n/cc @mkumatag \r\n/cc @ixdy \r\n/cc @luxas \r\n\r\n**Release note**:\r\n\r\n```release-note\r\nNONE\r\n```\r\n", + "body": "\r\n\r\n**What this PR does / why we need it**:\r\nIn our e2e test suite we have use an image \"registry.k8s.io/e2e-test-images:k8s-aggregator-sample-apiserver:1.7v2\". We need a way to build a fresh image that can we can use instead of that one. Especially we need one that has a multi-arch fat manifest so e2e tests can be run across multiple architectures.\r\n\r\nThis is especially important since we are in the process of promoting the test in question to the conformance suite - https://github.com/kubernetes/kubernetes/pull/63947\r\n\r\n**Which issue(s) this PR fixes** *(optional, in `fixes #(, fixes #, ...)` format, will close the issue(s) when PR gets merged)*:\r\nFixes #\r\n\r\n**Special notes for your reviewer**:\r\n/cc @mkumatag \r\n/cc @ixdy \r\n/cc @luxas \r\n\r\n**Release note**:\r\n\r\n```release-note\r\nNONE\r\n```\r\n", "head": { "repo": { "stargazers_count": 1, diff --git a/prow/test/integration/config/nginx.yaml b/prow/test/integration/config/nginx.yaml index 23628070ce57..c24212068c0e 100644 --- a/prow/test/integration/config/nginx.yaml +++ b/prow/test/integration/config/nginx.yaml @@ -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: @@ -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: @@ -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: From 81680d00433dcc82a1515901622b4517ea505d6e Mon Sep 17 00:00:00 2001 From: Swastik_Gour Date: Mon, 13 Feb 2023 15:40:22 +0530 Subject: [PATCH 3/3] original --- jobs/e2e_node/containerd/config-systemd.toml | 2 +- jobs/e2e_node/containerd/config.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/e2e_node/containerd/config-systemd.toml b/jobs/e2e_node/containerd/config-systemd.toml index 4a717fb064f1..bd00e621ce1b 100644 --- a/jobs/e2e_node/containerd/config-systemd.toml +++ b/jobs/e2e_node/containerd/config-systemd.toml @@ -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."registry.k8s.io"] +[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gro.io"] endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",] diff --git a/jobs/e2e_node/containerd/config.toml b/jobs/e2e_node/containerd/config.toml index b7dae29c3151..a2699f60ea80 100644 --- a/jobs/e2e_node/containerd/config.toml +++ b/jobs/e2e_node/containerd/config.toml @@ -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."registry.k8s.io"] +[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gro.io"] endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]