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.

Sign up for GitHub

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

Jump to bottom

Manual-cherry-pick-for-1.23: kubeadm: apply registry.k8s.io changes #113393

Merged
merged 3 commits into from Nov 22, 2022
Merged

Manual-cherry-pick-for-1.23: kubeadm: apply registry.k8s.io changes #113393

merged 3 commits into from Nov 22, 2022

Conversation

neolit123
Copy link
Member

What type of PR is this?

/kind feature

What this PR does / why we need it:

manual, kubeadm scoped backport of:
#109938
#110343

Which issue(s) this PR fixes:

xref kubernetes/kubeadm#2671

Special notes for your reviewer:

it is essentially a feature backport, as discussed with k8s-infra and sig-release

https://kubernetes.slack.com/archives/C2C40FMNF/p1666723622759119
kubernetes/kubeadm#2671 (comment)

Does this PR introduce a user-facing change?

kubeadm: use the image registry registry.k8s.io instead of k8s.gcr.io for new clusters. During upgrade, migrate users to registry.k8s.io if they were using the default of k8s.gcr.io.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 27, 2022
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. kind/feature Categorizes issue or PR as related to a new feature. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 27, 2022
@k8s-ci-robot k8s-ci-robot added area/kubeadm do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 27, 2022
@neolit123 neolit123 changed the title Backport 1.23 update registry k8s.io Manual-cherry-pick-for-1.23: kubeadm: apply registry.k8s.io changes Oct 27, 2022
@neolit123 neolit123 force-pushed the backport-1.23-update-registry-k8s.io branch from 28f3644 to 336d440 Compare October 27, 2022 11:14
@neolit123 neolit123 mentioned this pull request Oct 27, 2022
Closed
5 tasks
@neolit123
kubeadm: use registry.k8s.io instead of k8s.gcr.io
a98d0db 
Update constants, API types, and unit tests to use the new
registry location.

Update dependencies.yaml as well.
@neolit123 neolit123 force-pushed the backport-1.23-update-registry-k8s.io branch from 336d440 to d8f8c52 Compare October 27, 2022 11:33
@neolit123
Copy link
Member Author

/cc @SataQiu @pacoxu

pacoxu
pacoxu approved these changes Oct 27, 2022
View reviewed changes
Copy link
Member

@pacoxu pacoxu left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2022
@neolit123 neolit123 force-pushed the backport-1.23-update-registry-k8s.io branch from 6f16e72 to 6dddbb3 Compare October 27, 2022 17:51
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2022
@pacoxu
Copy link
Member

pacoxu commented Oct 28, 2022

/lgtm
/retest

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2022
@neolit123
kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s…
304eb41 
….io"

If the user runs "kubeadm upgrade apply", kubeadm can download
a configuration from the cluster. If the configuration contains
the legacy default imageRepository of "k8s.gcr.io", mutate it
to the new default of "registry.k8s.io" and update the
configuration in the config map.

During "upgrade node/diff" download the configuration, mutate the
image repository locally, but do not mutate the in-cluster value.
That is done only on "apply".

This ensures that users are migrated from the old default registry
domain.
@neolit123 neolit123 mentioned this pull request Oct 28, 2022
Merged
@neolit123
Copy link
Member Author

/retest

2 similar comments
@neolit123
Copy link
Member Author

/retest

@neolit123
Copy link
Member Author

/retest

@pacoxu
Copy link
Member

pacoxu commented Oct 30, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 30, 2022
SataQiu
SataQiu approved these changes Oct 30, 2022
View reviewed changes
Copy link
Member

@SataQiu SataQiu left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@pacoxu
Copy link
Member

pacoxu commented Oct 31, 2022

/assign @BenTheElder
for build package approval

@neolit123 neolit123 mentioned this pull request Nov 16, 2022
Merged
@dims
Copy link
Member

dims commented Nov 16, 2022

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2022
@neolit123 neolit123 mentioned this pull request Nov 22, 2022
Merged
@neolit123
Copy link
Member Author

@cpanato can we get this in as it's also keeping one of the kubeadm upgrade jobs broken?
https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-upgrade-1-22-1-23

cpanato
cpanato approved these changes Nov 22, 2022
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/triage accepted
/priority important-soon
/lgtm

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 22, 2022
@cpanato cpanato added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 22, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 22, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, dims, neolit123, pacoxu, SataQiu

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

@cpanato
Copy link
Member

cpanato commented Nov 22, 2022

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot merged commit 58d4ada into kubernetes:release-1.23 Nov 22, 2022
@liggitt liggitt mentioned this pull request Dec 7, 2022
Merged
This was referenced Dec 9, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pacoxu pacoxu pacoxu approved these changes

@cpanato cpanato cpanato approved these changes

@SataQiu SataQiu SataQiu approved these changes

@spiffxp spiffxp Awaiting requested review from spiffxp

@yagonobre yagonobre Awaiting requested review from yagonobre

Assignees

@dims dims

@BenTheElder BenTheElder

@pacoxu pacoxu

@cpanato cpanato

@SataQiu SataQiu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@neolit123 @pacoxu @dims @k8s-ci-robot @cpanato @SataQiu @BenTheElder