Skip to content

CNV-54744: KubeletConfig note - #117869

Merged
rheslop merged 1 commit into
openshift:enterprise-4.20from
erpeters157:CNV54744_kubelet_note
Aug 13, 2026
Merged

CNV-54744: KubeletConfig note#117869
rheslop merged 1 commit into
openshift:enterprise-4.20from
erpeters157:CNV54744_kubelet_note

Conversation

@erpeters157

@erpeters157 erpeters157 commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Add a note stressing the importance of doing the KubeletConfg configuration first.

Version(s):
4.20
4.19
4.18
4.17

Issue:
CNV-54744

Link to docs preview:
Using wasp-agent to increase VM workload density

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 12, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 12, 2026

Copy link
Copy Markdown

@erpeters157: This pull request references CNV-54744 which is a valid jira issue.

Details

In response to this:

Add a note stressing the importance of doing the KubeletConfg configuration first.

Version(s):
4.20
4.19
4.18
4.17

Issue:
CNV-54744

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 12, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Aug 12, 2026

Copy link
Copy Markdown

@jeniferh

Copy link
Copy Markdown

LGTM!

@erpeters157
erpeters157 force-pushed the CNV54744_kubelet_note branch from 21c8b88 to ad27795 Compare August 13, 2026 12:36
@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown

@erpeters157: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

@rheslop
rheslop merged commit 65d261a into openshift:enterprise-4.20 Aug 13, 2026
2 checks passed
@rheslop

rheslop commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick enterprise-4.19

@rheslop

rheslop commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick enterprise-4.18

@rheslop

rheslop commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick enterprise-4.17

@openshift-cherrypick-robot

Copy link
Copy Markdown

@rheslop: #117869 failed to apply on top of branch "enterprise-4.19":

Applying: CNV-54744: KubeletConfig note
Using index info to reconstruct a base tree...
M	modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
CONFLICT (content): Merge conflict in modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 CNV-54744: KubeletConfig note

Details

In response to this:

/cherry-pick enterprise-4.19

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@rheslop: #117869 failed to apply on top of branch "enterprise-4.18":

Applying: CNV-54744: KubeletConfig note
Using index info to reconstruct a base tree...
M	modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
CONFLICT (content): Merge conflict in modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 CNV-54744: KubeletConfig note

Details

In response to this:

/cherry-pick enterprise-4.18

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@rheslop: #117869 failed to apply on top of branch "enterprise-4.17":

Applying: CNV-54744: KubeletConfig note
Using index info to reconstruct a base tree...
M	modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
CONFLICT (content): Merge conflict in modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 CNV-54744: KubeletConfig note

Details

In response to this:

/cherry-pick enterprise-4.17

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

6 participants