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: remove deprecated hyperkube image support in v1beta3 #101537

Merged
merged 1 commit into from
May 10, 2021
Merged

kubeadm: remove deprecated hyperkube image support in v1beta3 #101537

merged 1 commit into from
May 10, 2021

Conversation

neolit123
Copy link
Member

@neolit123 neolit123 commented Apr 27, 2021 •
edited
Loading

What this PR does / why we need it:

The hyperkube image support was deprecated. Remove the field
ClusterConfiguration.UseHyperKubeImage from the new v1beta3 API.

Which issue(s) this PR fixes:

Fixes kubernetes/kubeadm#1889
xref kubernetes/kubeadm#1796

Special notes for your reviewer:

Does this PR introduce a user-facing change?

kubeadm: remove the deprecated hyperkube image support in v1beta3. This implies removal of ClusterConfiguration.UseHyperKubeImage.

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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 Apr 27, 2021
@neolit123 neolit123 mentioned this pull request Apr 27, 2021
Closed
2 tasks
@neolit123
Copy link
Member Author

/triage accepted
/kind deprecation cleanup
/priority important-soon
/cc @fabriziopandini @SataQiu @pacoxu

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 27, 2021
@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 sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 27, 2021
@neolit123
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 28, 2021
@neolit123
Copy link
Member Author

/hold
for review

@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 Apr 28, 2021
neolit123
neolit123 commented Apr 28, 2021
View reviewed changes
cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go Outdated
@@ -104,6 +104,8 @@ func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c fuzz.Continue
obj.APIServer.TimeoutForControlPlane = &metav1.Duration{
Duration: constants.DefaultControlPlaneTimeout,
}
// Does not exist in v1beta3+; round tripping would fail without this.
obj.UseHyperKubeImage = false
Copy link
Member Author

Choose a reason for hiding this comment

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

i had to pin this to make the fuzzer happy.

@neolit123 neolit123 mentioned this pull request Apr 28, 2021
Closed
16 tasks
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 28, 2021
pacoxu
pacoxu reviewed Apr 28, 2021
View reviewed changes
cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
@@ -23,7 +23,8 @@ limitations under the License.
// This version improves on the v1beta2 format by fixing some minor issues and adding a few new fields.
//
// A list of changes since v1beta2:
// - TODO
// - The deprecated "ClusterConfiguration.useHyperKubeImage" field has been removed.
// Kubeadm no longer supports the hyperkube image.
Copy link
Member

Choose a reason for hiding this comment

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

LGTM.

It will have a merge conflict with #101537 merged.
So I will add /lgtm later.

fabriziopandini
fabriziopandini reviewed Apr 28, 2021
View reviewed changes
cmd/kubeadm/app/apis/kubeadm/types.go Outdated
@@ -117,8 +117,7 @@ type ClusterConfiguration struct {
CIImageRepository string

// UseHyperKubeImage controls if hyperkube should be used for Kubernetes components instead of their respective separate images
// DEPRECATED: As hyperkube is itself deprecated, this fields is too. It will be removed in future kubeadm config versions, kubeadm
// will print multiple warnings when set to true, and at some point it may become ignored.
// TODO: Remove this with v1beta2 https://github.com/kubernetes/kubeadm/issues/2459
Copy link
Member

Choose a reason for hiding this comment

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

Should we remove this from internal types as well?
In the v1beta2 deprecation we already informed users that this will be ignored at a certain point...

Copy link
Member Author

Choose a reason for hiding this comment

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

i've removed the field from the internal type.

@neolit123
kubeadm: remove deprecated hyperkube image support in v1beta3
81d5b18 
The hyperkube image support was deprecated. Remove the field
ClusterConfiguration.UseHyperKubeImage from the new v1beta3 API.
@neolit123
Copy link
Member Author

/retest

@pacoxu
Copy link
Member

pacoxu commented Apr 29, 2021

/retest
/lgtm

1 similar comment
@pacoxu
Copy link
Member

pacoxu commented Apr 29, 2021

/retest
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 29, 2021
@neolit123
Copy link
Member Author

/retest

fabriziopandini
fabriziopandini reviewed May 5, 2021
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm

@neolit123
Copy link
Member Author

/hold cancel
/retest

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 10, 2021
@k8s-ci-robot k8s-ci-robot merged commit 347730b into kubernetes:master May 10, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone May 10, 2021
@github-actions github-actions bot mentioned this pull request May 11, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pacoxu pacoxu pacoxu left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@SataQiu SataQiu Awaiting requested review from SataQiu

@RA489 RA489 Awaiting requested review from RA489

@yagonobre yagonobre Awaiting requested review from yagonobre

Assignees

@pacoxu pacoxu

@fabriziopandini fabriziopandini

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. 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.22
Development

Successfully merging this pull request may close these issues.

deprecate and remove hyperkube support in kubeadm
4 participants
@neolit123 @k8s-ci-robot @pacoxu @fabriziopandini