-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Conversation
Welcome @swastik959! |
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 Once the patch is verified, the new status will be reflected by the 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. |
@swastik959 there are more references to "k8s.gcr.io" in the repo. I suggest you can try |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: swastik959 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 |
@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 |
There was a problem hiding this comment.
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 ?
There was a problem hiding this comment.
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
/assign |
@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))' |
There was a problem hiding this comment.
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))' |
There was a problem hiding this comment.
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.
why this issue is still open? |
@Sajiyah-Salat why wouldn't the PR still be open? There were unaddressed review comments so it wasn't ready for merge yet. |
@@ -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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
@swastik959: The following test failed, say
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", |
There was a problem hiding this comment.
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"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why rename gcr -> gro?
@swastik959 Please fix CI test failures and address remaining review comments, thanks. |
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. |
/retitle Replace k8s.gcr.io with registry.k8s.io |
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 |
replaced k8s.gro.io with registry.k8s.io