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

OCPBUGS-14026: cgroup: Match the name of the cgroup to what is expected by kubelet #758

Merged

Conversation

swatisehgal
Copy link
Contributor

Ensure consistent naming of system cgroup in order to ensure that it matches cgroup name expected by Kubelet.

Ensure consistent naming of system cgroup in order to ensure that it matches
cgroup name expected by Kubelet.

Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
@openshift-ci openshift-ci bot requested review from MarSik and yanirq August 14, 2023 12:41
@swatisehgal
Copy link
Contributor Author

/cc @haircommander @browsell

@browsell
Copy link
Contributor

/lgtm

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

yanirq commented Aug 15, 2023

@swatisehgal you might need to align the render command tests (see failing job for ci/prow/e2e-no-cluster)

@yanirq
Copy link
Contributor

yanirq commented Aug 15, 2023

/retitle OCPBUGS-14026: cgroup: Match the name of the cgroup to what is expected by kubelet

@openshift-ci openshift-ci bot changed the title cgroup: Match the name of the cgroup to what is expected by kubelet OCPBUGS-14026: cgroup: Match the name of the cgroup to what is expected by kubelet Aug 15, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 15, 2023
@openshift-ci-robot
Copy link
Contributor

@swatisehgal: This pull request references Jira Issue OCPBUGS-14026, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (mniranja@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Ensure consistent naming of system cgroup in order to ensure that it matches cgroup name expected by Kubelet.

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-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 15, 2023
@browsell
Copy link
Contributor

/approve

Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2023
@swatisehgal
Copy link
Contributor Author

/retest

@Tal-or
Copy link
Contributor

Tal-or commented Aug 16, 2023

Is it possible to add an e2e for verifying the fix?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2023

@swatisehgal: 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.

@browsell
Copy link
Contributor

/lgtm

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

/hold
The fix needs to be verified.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 17, 2023
@swatisehgal
Copy link
Contributor Author

Is it possible to add an e2e for verifying the fix?

Sure, I am currently thinking about how to to verify this fix. As per @MarSik there is potentially a race condition between kubelet and cpuset-configure so verifying the fix is going to be a bit tricky but let's see if we can find a way.

@yanirq
Copy link
Contributor

yanirq commented Aug 17, 2023

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: browsell, swatisehgal, yanirq

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 Aug 17, 2023
@swatisehgal
Copy link
Contributor Author

/unhold

As @browsell has verified the fix. We will defer adding the e2e test in a follow-up PR.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 17, 2023
@openshift-merge-robot openshift-merge-robot merged commit 5517330 into openshift:master Aug 17, 2023
13 checks passed
@openshift-ci-robot
Copy link
Contributor

@swatisehgal: Jira Issue OCPBUGS-14026: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-14026 has been moved to the MODIFIED state.

In response to this:

Ensure consistent naming of system cgroup in order to ensure that it matches cgroup name expected by Kubelet.

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.

@swatisehgal swatisehgal deleted the rename-system-cgroup branch August 17, 2023 10:57
@swatisehgal
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@swatisehgal: #758 failed to apply on top of branch "release-4.13":

Applying: cgroup: Match the name of the cgroup to what is expected by kubelet
Using index info to reconstruct a base tree...
M	assets/performanceprofile/scripts/cpuset-configure.sh
Falling back to patching base and 3-way merge...
Auto-merging assets/performanceprofile/scripts/cpuset-configure.sh
Applying: cgroup: test: update content source for netdev physical rps rules
Using index info to reconstruct a base tree...
M	test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 cgroup: test: update content source for netdev physical rps rules
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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.

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. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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

7 participants