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

CNF-10344: NTO: Avoid depending on kubernetes cpuset #848

Merged
merged 1 commit into from Nov 14, 2023

Conversation

jlojosnegros
Copy link
Contributor

@jlojosnegros jlojosnegros commented Nov 13, 2023

Change k8s.io/kubernetes/pkg/kubelet/cm/cpuset to k8s.io/utils/cpuset

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 13, 2023
Copy link
Contributor

openshift-ci bot commented Nov 13, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@jlojosnegros
Copy link
Contributor Author

/test all

@jlojosnegros
Copy link
Contributor Author

/test e2e-upgrade

@jlojosnegros jlojosnegros marked this pull request as ready for review November 13, 2023 13:58
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 13, 2023
@jlojosnegros
Copy link
Contributor Author

/cc @jmencak
/cc @ffromani

@ffromani
Copy link
Contributor

is it time yet to bump to kube 1.28?

@jlojosnegros
Copy link
Contributor Author

is it time yet to bump to kube 1.28?

Not really sure about that.
I just did it cause I found some problems while rebasing openshift/hypershift#1782 as hypershift uses v0.28.3 for some of the dependencies and from v0.28.0 onwards k8s.io/kubernetes/pkg/kubelet/cm/cpuset does not exists any more and k8s.io/utils/cpuset should be used instead here

@ffromani
Copy link
Contributor

is it time yet to bump to kube 1.28?

Not really sure about that. I just did it cause I found some problems while rebasing openshift/hypershift#1782 as hypershift uses v0.28.3 for some of the dependencies and from v0.28.0 onwards k8s.io/kubernetes/pkg/kubelet/cm/cpuset does not exists any more and k8s.io/utils/cpuset should be used instead here

k8s.io/utils/cpuset is pretty self contained so you can just add that dep in theory. I'd try first bumping only the k8s.io/utils dep to 1.28 and see how it goes. I'm confident this should work - and surely it's a way less invasive change.

Change k8s.io/kubernetes/pkg/kubelet/cm/cpuset to k8s.io/utils/cpuset

Signed-off-by: Jose Luis Ojosnegros Manchón <jojosneg@redhat.com>
@jlojosnegros jlojosnegros changed the title bump k8s version to 0.28.3 Avoid k8s.io/kubernetes as deps Nov 13, 2023
@ffromani
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2023
Copy link
Contributor

openshift-ci bot commented Nov 13, 2023

@jlojosnegros: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@jmencak
Copy link
Contributor

jmencak commented Nov 13, 2023

/approve

Copy link
Contributor

openshift-ci bot commented Nov 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlojosnegros, jmencak

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2023
@jlojosnegros
Copy link
Contributor Author

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 14, 2023
@jlojosnegros jlojosnegros changed the title Avoid k8s.io/kubernetes as deps CNF-10344: NTO: Avoid depending on kubernetes cpuset Nov 14, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 14, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 14, 2023

@jlojosnegros: This pull request references CNF-10344 which is a valid jira issue.

In response to this:

Change k8s.io/kubernetes/pkg/kubelet/cm/cpuset to k8s.io/utils/cpuset

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/test-infra repository.

@openshift-merge-bot openshift-merge-bot bot merged commit cd53f65 into openshift:master Nov 14, 2023
14 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-node-tuning-operator-container-v4.15.0-202311141110.p0.gcd53f65.assembly.stream for distgit cluster-node-tuning-operator.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants