Skip to content

migrate from k8s.gcr.io to registry.k8s.io#7038

Merged
samuelkarp merged 1 commit intocontainerd:mainfrom
pacoxu:registry-change
Aug 24, 2022
Merged

migrate from k8s.gcr.io to registry.k8s.io#7038
samuelkarp merged 1 commit intocontainerd:mainfrom
pacoxu:registry-change

Conversation

@pacoxu
Copy link
Copy Markdown
Contributor

@pacoxu pacoxu commented Jun 9, 2022

Signed-off-by: Paco Xu [email protected]

Kubernetes migrated to registry.k8s.io since kubernetes/kubernetes#109938.

I'm not sure if contained should migrate to it in this release cycle 1.7. Or at least, pause image should migrate to registry.k8s.io .

Some context can be found in

the k8s project is moving away from k8s.gcr.io to registry.k8s.io.

  • registry.k8s.io is currently redirecting to k8s.gcr.io
  • in 1.25 we should switch kubeadm's code to use registry.k8s.io by default.
  • k8s.gcr.io will continue working (for some time) by redirecting to registry.k8s.io

@k8s-ci-robot
Copy link
Copy Markdown

Hi @pacoxu. Thanks for your PR.

I'm waiting for a containerd 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.

Details

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.

@pacoxu pacoxu force-pushed the registry-change branch from f6d14b2 to 4bf83b0 Compare June 9, 2022 08:22
@pacoxu
Copy link
Copy Markdown
Contributor Author

pacoxu commented Jun 9, 2022

/cc @dims

@k8s-ci-robot
Copy link
Copy Markdown

@pacoxu: GitHub didn't allow me to request PR reviews from the following users: dmis.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/cc @dmis

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.

@dims
Copy link
Copy Markdown
Member

dims commented Jun 9, 2022

@pacoxu Let's land this here closer to the k8s 1.25 release and not before. is that fair? thanks!

@pacoxu
Copy link
Copy Markdown
Contributor Author

pacoxu commented Jun 9, 2022

@pacoxu Let's land this here closer to the k8s 1.25 release and not before. is that fair? thanks!

OK.

We meet a problem in kubeadm/kinder e2e test on the latest kubeadm on the old kubelet(n-1 version). The problem is for the loaded image is gcr image and kubeadm is using registry.k8s.io(kinder needs to load the image before using it.). We should take attention to similar issues in some e2e tests. Details in #7038.

@dims
Copy link
Copy Markdown
Member

dims commented Jun 9, 2022

@pacoxu ack, let's see if we can fix it on kinder side?

@pacoxu
Copy link
Copy Markdown
Contributor Author

pacoxu commented Jun 23, 2022

I found that kubernetes-sigs/kind#2688 is adding this repo as a mirror of the other.

  • This will cause kind to pull from registry.k8s.io first before k8s.gcr.io directly if that fails.

@pacoxu
Copy link
Copy Markdown
Contributor Author

pacoxu commented Aug 24, 2022

@dims
kubernetes v1.25 is out.

Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp
Copy link
Copy Markdown
Member

estesp commented Aug 24, 2022

/ok-to-test

@samuelkarp samuelkarp merged commit 8ce32ae into containerd:main Aug 24, 2022
@SergeyKanzhelev
Copy link
Copy Markdown
Contributor

Would it make sense to cherry-pick this to 1.5 and 1.6? Explicit new name of registry may be better than the redirect that may soon be introduced.

@samuelkarp samuelkarp added area/cri Container Runtime Interface (CRI) cherry-pick/1.5.x labels Oct 18, 2022
@samuelkarp samuelkarp added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch and removed cherry-pick/1.5.x labels Oct 18, 2022
@samuelkarp samuelkarp added the cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch label Oct 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch ok-to-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants