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

kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" #110343

Merged
merged 1 commit into from Jun 2, 2022
Merged

kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" #110343

merged 1 commit into from Jun 2, 2022

Conversation

neolit123
Copy link
Member

@neolit123 neolit123 commented Jun 2, 2022 •
edited

What type of PR is this?

/kind feature
/kind deprecation

What this PR does / why we need it:

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.

Which issue(s) this PR fixes:

xref kubernetes/kubeadm#2671

Special notes for your reviewer:

NONE

Does this PR introduce a user-facing change?

kubeadm: during "upgrade apply/diff/node", in case the "ClusterConfiguration.imageRepository" stored in the "kubeadm-config" ConfigMap contains the legacy "k8s.gcr.io" repository, modify it to the new default "registry.k8s.io". Reflect the change in the in-cluster ConfigMap only during "upgrade apply".

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

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. 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 Jun 2, 2022
@neolit123 neolit123 mentioned this pull request Jun 2, 2022
Closed
5 tasks
@neolit123
Copy link
Member Author

/priority important-soon
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. labels Jun 2, 2022
@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 2, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2022
@RA489
Copy link

RA489 commented Jun 2, 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 Jun 2, 2022
@RA489
Copy link

RA489 commented Jun 2, 2022

Cc @pacoxu

SataQiu
SataQiu reviewed Jun 2, 2022
View reviewed changes
cmd/kubeadm/app/cmd/upgrade/common.go
if err := uploadconfig.MutateImageRepository(cfg, client); err != nil {
return nil, false, err
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to make similar changes at these locations as well?
https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/cmd/upgrade/diff.go#L121
https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/cmd/upgrade/node.go#L142

Copy link
Member

Choose a reason for hiding this comment

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

/hold

Feel free to cancel hold @neolit123

Copy link
Member Author

@neolit123 neolit123 Jun 2, 2022 •
edited

Choose a reason for hiding this comment

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

good point @SataQiu

so for "diff" i think we should make the change as "diff" can be executed before "apply". for "node" we can do it too, but the upgrade sequence is always to run "apply" first and only then "node". it can be done just in case for consistency.

Copy link
Member Author

Choose a reason for hiding this comment

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

thinking more about this, we should mutate the in cluster config only during "apply" and just mutate the local fetched struct copy during "diff" and "node".

Copy link
Member Author

Choose a reason for hiding this comment

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

updated.

Copy link
Member

Choose a reason for hiding this comment

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

/hold cancel
/lgtm

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 2, 2022
@neolit123
Copy link
Member Author

/retest

@neolit123
kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s…
1c46686 
….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 force-pushed the 1.25-mutate-image-repo-in-cluster-config branch from 333e74e to 1c46686 Compare June 2, 2022 14:37
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 2, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2022
@k8s-ci-robot k8s-ci-robot merged commit da81385 into kubernetes:master Jun 2, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Jun 2, 2022
@sbueringer sbueringer mentioned this pull request Jun 8, 2022
Closed
@sbueringer sbueringer mentioned this pull request Jun 17, 2022
Closed
29 tasks
@pacoxu pacoxu mentioned this pull request Aug 24, 2022
Merged
@ameukam ameukam mentioned this pull request Oct 25, 2022
Closed
xmcqueen added a commit to xmcqueen/kubernetes that referenced this pull request Oct 27, 2022
@xmcqueen
Move from k8s.gcr.io to registry.k8s.io
e44e0f2 
kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" kubernetes#110343
This was referenced Oct 27, 2022
Merged
Merged
Closed
Merged
xmcqueen added a commit to xmcqueen/kubernetes that referenced this pull request Oct 29, 2022
@xmcqueen
Move from k8s.gcr.io to registry.k8s.io
80cf39c 
kubeadm: mutate ClusterConfiguration.imageRepository to "registry.k8s.io" kubernetes#110343
@jackfrancis jackfrancis mentioned this pull request Nov 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SataQiu SataQiu SataQiu left review comments

@RA489 RA489 Awaiting requested review from RA489

Assignees

@SataQiu SataQiu

@RA489 RA489

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@neolit123 @k8s-ci-robot @RA489 @SataQiu