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

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

Closed
wants to merge 3 commits into from

Conversation

swastik959
Copy link

@swastik959 swastik959 commented Feb 8, 2023

replaced k8s.gro.io with registry.k8s.io

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 8, 2023
@k8s-ci-robot k8s-ci-robot requested a review from aojea February 8, 2023 04:52
@k8s-ci-robot k8s-ci-robot added the area/config Issues or PRs related to code in /config label Feb 8, 2023
@k8s-ci-robot k8s-ci-robot added area/prow/bump Updates to the k8s prow cluster sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Feb 8, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @swastik959!

It looks like this is your first PR to kubernetes/test-infra 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/test-infra has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 8, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @swastik959. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@reetasingh
Copy link
Contributor

@swastik959 there are more references to "k8s.gcr.io" in the repo. I suggest you can try grep -rnw . -e "k8s.gcr.io" to find all the references

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. area/artifacts Issues or PRs related to the hosting of release artifacts for subprojects area/jobs area/label_sync Issues or PRs related to code in /label_sync area/prow Issues or PRs related to prow and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 9, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: swastik959
Once this PR has been reviewed and has the lgtm label, please assign cblecker, chases2 for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 area/prow/phony Issues or PRs related to prow's phony component area/release-eng Issues or PRs related to the Release Engineering subproject sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. labels Feb 9, 2023
@swastik959
Copy link
Author

swastik959 commented Feb 9, 2023

@swastik959 there are more references to "k8s.gcr.io" in the repo. I suggest you can try grep -rnw . -e "k8s.gcr.io" to find all the references

@reetasingh thanks I have tried to change a few file please have a look

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

@bart0sh
Copy link
Contributor

bart0sh commented Feb 10, 2023

/assign
/assign @SergeyKanzhelev

@swastik959
Copy link
Author

swastik959 commented Feb 10, 2023

@swastik959 There are still some refs left:

$ git grep k8s.gcr.io
config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml:    run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
jobs/e2e_node/containerd/config-systemd.toml:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config-systemd.toml:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
jobs/e2e_node/containerd/config.toml:# Enable registry.k8s.io as the primary mirror for k8s.gcr.io
jobs/e2e_node/containerd/config.toml:  endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]

/ok-to-test

@bart0sh Do I need to change enable and the endpoint also??

@@ -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.

@@ -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.

@Sajiyah-Salat
Copy link

why this issue is still open?

@BenTheElder
Copy link
Member

@Sajiyah-Salat why wouldn't the PR still be open?

There were unaddressed review comments so it wasn't ready for merge yet.
It had only been a few days since those comments were made though.

@@ -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.

@@ -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

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 15, 2023

@swastik959: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-test-infra-verify-lint 81680d0 link true /test pull-test-infra-verify-lint

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@@ -155,7 +155,7 @@
}
},
"diff_url": "https://github.com/kubernetes/kubernetes/pull/66686.diff",
"body": "<!-- Thanks for sending a pull request! Here are some tips for you:\r\n1. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide\r\n2. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews\r\n3. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md\r\n4. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests\r\n-->\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 #<issue number>(, fixes #<issue_number>, ...)` 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<!-- Write your release note:\r\n1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string \"action required\".\r\n2. If no release note is required, just write \"NONE\".\r\n-->\r\n```release-note\r\nNONE\r\n```\r\n",
"body": "<!-- Thanks for sending a pull request! Here are some tips for you:\r\n1. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide\r\n2. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews\r\n3. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md\r\n4. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests\r\n-->\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 #<issue number>(, fixes #<issue_number>, ...)` 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<!-- Write your release note:\r\n1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string \"action required\".\r\n2. If no release note is required, just write \"NONE\".\r\n-->\r\n```release-note\r\nNONE\r\n```\r\n",
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: why is this changed? just trailing whitespace added(?)

@@ -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."k8s.gro.io"]
Copy link
Contributor

Choose a reason for hiding this comment

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

why rename gcr -> gro?

@bart0sh
Copy link
Contributor

bart0sh commented Feb 22, 2023

@swastik959 Please fix CI test failures and address remaining review comments, thanks.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 6, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@sftim
Copy link
Contributor

sftim commented Mar 8, 2023

/retitle Replace k8s.gcr.io with registry.k8s.io

@k8s-ci-robot k8s-ci-robot changed the title replaced k8s.gro.io with registry.k8s.io Replace k8s.gcr.io with registry.k8s.io Mar 8, 2023
@BenTheElder
Copy link
Member

Thanks for the PR.

Since this seems to be tricker than initially expected and it's been some time, I did a full pass through and filed a smaller PR with the necessary changes in #28985

/close

@swastik959 swastik959 deleted the co1 branch March 10, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/artifacts Issues or PRs related to the hosting of release artifacts for subprojects area/config Issues or PRs related to code in /config area/jobs area/label_sync Issues or PRs related to code in /label_sync area/prow/bump Updates to the k8s prow cluster area/prow/phony Issues or PRs related to prow's phony component area/prow Issues or PRs related to prow area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

10 participants