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

Remove kubeadm >=1.32 dependency from crictl #3626

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented May 29, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

The merge of kubernetes/kubernetes#124685 will make kubeadm work without crictl. We now reflect that in the packaging as well as defined in kubernetes/kubeadm#3064.

Which issue(s) this PR fixes:

Refers to kubernetes/kubeadm#3064

Special notes for your reviewer:

cc @neolit123 @carlory

Does this PR introduce a user-facing change?

Make kubeadm >= 1.32 independent from crictl due to https://github.com/kubernetes/kubernetes/pull/124685

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. area/release-eng Issues or PRs related to the Release Engineering subproject labels May 29, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 29, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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/release Categorizes an issue or PR as relevant to SIG Release. approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 29, 2024
@carlory
Copy link
Member

carlory commented May 29, 2024

/hold

for the next release cycle (1.32)

@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 May 29, 2024
@saschagrunert saschagrunert changed the title WIP: Remove kubeadm >=1.31 dependency from crictl WIP: Remove kubeadm >=1.32 dependency from crictl May 29, 2024
The merge of kubernetes/kubernetes#124685 will
make kubeadm work without crictl. We now reflect that in the packaging
as well as defined in kubernetes/kubeadm#3064.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert saschagrunert changed the title WIP: Remove kubeadm >=1.32 dependency from crictl Remove kubeadm >=1.32 dependency from crictl May 29, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 29, 2024
@saschagrunert
Copy link
Member Author

/hold

for the next release cycle (1.32)

I changed the versions so we may not need the hold :)

@carlory
Copy link
Member

carlory commented May 29, 2024

Okay, the title is enough to tell us when it should be merged.
I add a lifecycle/frozen to avoid it being closed by the bot due to inactivity.

/hold cancel
/lifecycle frozen

@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 29, 2024
@k8s-ci-robot
Copy link
Contributor

@carlory: The lifecycle/frozen label cannot be applied to Pull Requests.

In response to this:

Okay, the title is enough to tell us when it should be merged. IMO, The do-not-merged/hold label makes it clear that it should not be merged until the hold is removed.

I add a lifecycle/frozen to avoid it being closed by the bot due to inactivity.

/hold cancel
/lifecycle frozen

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-sigs/prow repository.

@xmudrii
Copy link
Member

xmudrii commented May 29, 2024

@saschagrunert @carlory If we're confident that the referenced k/k PRs will be merged, we can merge this PR now (once the comment I left is resolved). This change will be only applied on package versions starting from 1.32.0, earlier version are unaffected.

@carlory
Copy link
Member

carlory commented May 29, 2024

/cc @neolit123 @pacoxu

@neolit123
Copy link
Member

/hold
until .32

the frozen label is for issues only.

@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 May 29, 2024
@neolit123
Copy link
Member

@saschagrunert @carlory If we're confident that the referenced k/k PRs will be merged, we can merge this PR now (once the comment I left is resolved). This change will be only applied on package versions starting from 1.32.0, earlier version are unaffected.

sorry missed the comment. yes, but we should wait until the k/k PR and k/website changes merge at least.
also this assume we have confidence that we can drop the dependency exactly at 1.32.

we can also actually wait for 1.32 and see if there is any negative feedback about it during the 1.31 cycle.

@saschagrunert
Copy link
Member Author

@neolit123 @kubernetes/release-managers can we unhold this?

Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

SGTM, thanks
/hold cancel

@neolit123
Copy link
Member

/lgtm

@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 Aug 14, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 14, 2024
@k8s-ci-robot k8s-ci-robot merged commit 186460d into kubernetes:master Aug 14, 2024
11 checks passed
@saschagrunert saschagrunert deleted the kubeadm-crictl branch August 14, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject 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. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants