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

[Backport release-1.24] Switch from k8s.gcr.io to registry.k8s.io #2408

Merged

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Nov 15, 2022

Description

Backport of #2407, see #2346.

Kubernetes switched to the new registry in k8s 1.25. Do the same for k0s.

Reference: kubernetes/k8s.io#1834 and kubernetes/kubernetes#109938.

This also fixes a discrepancy between the default pause image used in containerd and the one used by k0s.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added chore backport/release-1.23 PR that needs to be backported/cherrypicked to release-1.23 branch labels Nov 15, 2022
@twz123 twz123 requested a review from a team as a code owner November 15, 2022 11:33
@twz123 twz123 force-pushed the backport-2407-to-release-1.24 branch from 6608aa9 to 37ce4a4 Compare November 15, 2022 11:35
Kubernetes switched to the new registry in k8s 1.25.
Do the same for k0s.

Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit bf9f9f6)
(cherry picked from commit 4b2739b)
@twz123 twz123 force-pushed the backport-2407-to-release-1.24 branch from 37ce4a4 to 1ef6572 Compare November 15, 2022 11:37
Copy link
Contributor

@juanluisvaladas juanluisvaladas left a comment

Choose a reason for hiding this comment

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

LGTM

@twz123 twz123 merged commit 706ffdd into k0sproject:release-1.24 Nov 15, 2022
@k0s-bot
Copy link

k0s-bot commented Nov 15, 2022

Backport failed for release-1.23, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-1.23
git worktree add -d .worktree/backport-2408-to-release-1.23 origin/release-1.23
cd .worktree/backport-2408-to-release-1.23
git checkout -b backport-2408-to-release-1.23
ancref=$(git merge-base 87a3aa88da72a103efdd723664e88b45908fe00a 1ef657219e776b009a18d6d8bffc9d5c36ed3a28)
git cherry-pick -x $ancref..1ef657219e776b009a18d6d8bffc9d5c36ed3a28

@twz123 twz123 deleted the backport-2407-to-release-1.24 branch November 15, 2022 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/release-1.23 PR that needs to be backported/cherrypicked to release-1.23 branch chore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants