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

cleanup k8s.gcr.io references #28985

Merged
merged 3 commits into from
Mar 10, 2023

Conversation

BenTheElder
Copy link
Member

This leaves valid references, which can be tricky to determine.

Remaining:

$ git grep -n k8s.gcr.io
config/jobs/image-pushing/README.md:163:[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md
config/jobs/kubernetes/kops/build_jobs.py:459:        # A one-off scenario testing the k8s.gcr.io mirror
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:11:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:22:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:39:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:51:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:33:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:52:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:249:      - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
experiment/print-job-image-summary.sh:56:      - k8s.gcr.io                                    $(image_include_exclude "k8s\.gcr\.io" "^$")
jobs/e2e_node/containerd/config-systemd.toml:35:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config-systemd.toml:37:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config-systemd.toml:38:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
jobs/e2e_node/containerd/config.toml:29:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config.toml:31:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config.toml:32:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
label_sync/labels.md:393:| <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) |
label_sync/labels.yaml:1025:        description: Code in k8s.gcr.io/
label_sync/labels.yaml:1026:        name: area/k8s.gcr.io
config/jobs/image-pushing/README.md:163:[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md

This is still the correct link

config/jobs/kubernetes/kops/build_jobs.py:459:        # A one-off scenario testing the k8s.gcr.io mirror
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:11:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
> config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:22:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:39:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:51:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:33:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:52:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:249:      - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io

These are the correctly configured jobs for https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io
That directory will eventually be wound down, but we're not there yet. When the k8s.io repo is ready, we'll update here as part of that. This is a complex change part of a larger KEP to freeze GCR and switch to registry.k8s.io

experiment/print-job-image-summary.sh:56:      - k8s.gcr.io                                    $(image_include_exclude "k8s\.gcr\.io" "^$")

This is an old script just printing what images are in use in our CI jobs.
It's still relevant to list if any are coming from k8s.gcr.io, I'd argue more relevant than ever now (since none should be, but someone might on accident)

jobs/e2e_node/containerd/config-systemd.toml:35:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config-systemd.toml:37:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config-systemd.toml:38:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
jobs/e2e_node/containerd/config.toml:29:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config.toml:31:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config.toml:32:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]

All of this is configuring CI environments to pull form registry.k8s.io for any k8s.gcr.io images, this requires a reference to the old registry to remap it to the new one and is working as intended.

label_sync/labels.md:393:| <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) |
label_sync/labels.yaml:1025:        description: Code in k8s.gcr.io/
label_sync/labels.yaml:1026:        name: area/k8s.gcr.io

This label is for https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io again.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/config Issues or PRs related to code in /config area/jobs sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Mar 9, 2023
@k8s-ci-robot k8s-ci-robot requested review from aojea and chases2 March 9, 2023 23:15
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 9, 2023
@BenTheElder
Copy link
Member Author

fixes #28665, #28674, #28974

@@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

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

this is the only line that matches the existing pull requests, it's a small enough change that it seemed better to just include it.

the other changes in this PR are different and based on closely inspecting each remaining reference.

@ameukam
Copy link
Member

ameukam commented Mar 10, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 7bb3c7b into kubernetes:master Mar 10, 2023
@k8s-ci-robot
Copy link
Contributor

@BenTheElder: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

  • key manifests.yaml using file config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml

In response to this:

This leaves valid references, which can be tricky to determine.

Remaining:

$ git grep -n k8s.gcr.io
config/jobs/image-pushing/README.md:163:[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md
config/jobs/kubernetes/kops/build_jobs.py:459:        # A one-off scenario testing the k8s.gcr.io mirror
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:11:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:22:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:39:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:51:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:33:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:52:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:249:      - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
experiment/print-job-image-summary.sh:56:      - k8s.gcr.io                                    $(image_include_exclude "k8s\.gcr\.io" "^$")
jobs/e2e_node/containerd/config-systemd.toml:35:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config-systemd.toml:37:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config-systemd.toml:38:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
jobs/e2e_node/containerd/config.toml:29:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config.toml:31:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config.toml:32:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
label_sync/labels.md:393:| <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) |
label_sync/labels.yaml:1025:        description: Code in k8s.gcr.io/
label_sync/labels.yaml:1026:        name: area/k8s.gcr.io
config/jobs/image-pushing/README.md:163:[gcr instructions]: https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/README.md

This is still the correct link

config/jobs/kubernetes/kops/build_jobs.py:459:        # A one-off scenario testing the k8s.gcr.io mirror
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:11:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
> config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:22:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:39:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:51:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:33:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:52:        - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml:249:      - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io

These are the correctly configured jobs for https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io
That directory will eventually be wound down, but we're not there yet. When the k8s.io repo is ready, we'll update here as part of that. This is a complex change part of a larger KEP to freeze GCR and switch to registry.k8s.io

experiment/print-job-image-summary.sh:56:      - k8s.gcr.io                                    $(image_include_exclude "k8s\.gcr\.io" "^$")

This is an old script just printing what images are in use in our CI jobs.
It's still relevant to list if any are coming from k8s.gcr.io, I'd argue more relevant than ever now (since none should be, but someone might on accident)

jobs/e2e_node/containerd/config-systemd.toml:35:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config-systemd.toml:37:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config-systemd.toml:38:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
jobs/e2e_node/containerd/config.toml:29:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config.toml:31:[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
jobs/e2e_node/containerd/config.toml:32:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]

All of this is configuring CI environments to pull form registry.k8s.io for any k8s.gcr.io images, this requires a reference to the old registry to remap it to the new one and is working as intended.

label_sync/labels.md:393:| <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) |
label_sync/labels.yaml:1025:        description: Code in k8s.gcr.io/
label_sync/labels.yaml:1026:        name: area/k8s.gcr.io

This label is for https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io again.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/jobs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants