search

openshift / cluster-node-tuning-operator

Manage node-level tuning by orchestrating the tuned daemon.
Apache License 2.0
102 stars 105 forks source link

OCPBUGS-27948: Tuned rendering and MCP detection improvements #928

Closed MarSik closed 9 months ago

MarSik commented 10 months ago

This is a backport of three related PRs: #878, #833 and #924 that improve the rendering mode during the installation bootstrap phase.

The most notable change is the added assumption that basic master and worker MachineConfigPools with default labels will always exist even though they are not yet available in the input manifest folder.

openshift-ci[bot] commented 10 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MarSik

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: - ~~[OWNERS](https://github.com/openshift/cluster-node-tuning-operator/blob/release-4.15/OWNERS)~~ [MarSik] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 10 months ago

@MarSik: This pull request references Jira Issue OCPBUGS-27948, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/928): > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
MarSik commented 10 months ago

/jira refresh

openshift-ci-robot commented 10 months ago

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

6 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.0) matches configured target version for branch (4.15.0) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * dependent bug [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED) * dependent [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @shajmakh

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/928#issuecomment-1909722638): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
MarSik commented 10 months ago

@jlojosnegros @vitus133 @eggfoobar Took a me a while to untangle the patch ordering, but this should be it.

openshift-ci-robot commented 10 months ago

@MarSik: This pull request references Jira Issue OCPBUGS-27948, which is valid.

6 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.0) matches configured target version for branch (4.15.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * dependent bug [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED) * dependent [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @shajmakh

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/928): >This is a backport of two PRs: #878 and #833 that improve the rendering mode during the installation bootstrap phase. > >The most notable change is the added assumption that basic master and worker MachineConfigPools with default labels will always exist even though they are not yet available in the input manifest folder. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
MarSik commented 10 months ago

/label backport-risk-assessed

MarSik commented 10 months ago

I guess there's no simple way to test before to commit.

Actually there is a way. I executed the code and it generated the exact same manifests we already had in the repo. git reported no changes. I also executed the e2e local tests that validate the rendering and all passed. That probably means the output is still valid and matches the rendered yamls.

MarSik commented 10 months ago

/retest-required

openshift-ci-robot commented 9 months ago

@MarSik: This pull request references Jira Issue OCPBUGS-27948, which is valid.

6 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.0) matches configured target version for branch (4.15.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * dependent bug [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED) * dependent [Jira Issue OCPBUGS-22095](https://issues.redhat.com//browse/OCPBUGS-22095) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @shajmakh

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

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/928): >This is a backport of three related PRs: #878, #833 and #924 that improve the rendering mode during the installation bootstrap phase. > >The most notable change is the added assumption that basic master and worker MachineConfigPools with default labels will always exist even though they are not yet available in the input manifest folder. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
yanirq commented 9 months ago

/retest

yanirq commented 9 months ago

/retest

shajmakh commented 9 months ago

/label cherry-pick-approved

yanirq commented 9 months ago

/retest-required

yanirq commented 9 months ago

/lgtm

openshift-ci-robot commented 9 months ago

/retest-required

Remaining retests: 0 against base HEAD b4be0464700b4597bab8f7f083d116d357caa841 and 2 for PR HEAD 644c51825310f2513214d47572d7a5a2134ccbb3 in total

openshift-ci[bot] commented 9 months ago

@MarSik: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci-robot commented 9 months ago

@MarSik: Jira Issue OCPBUGS-27948: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/928): >This is a backport of three related PRs: #878, #833 and #924 that improve the rendering mode during the installation bootstrap phase. > >The most notable change is the added assumption that basic master and worker MachineConfigPools with default labels will always exist even though they are not yet available in the input manifest folder. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-bot commented 9 months ago

[ART PR BUILD NOTIFIER]

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

openshift-merge-robot commented 9 months ago

Fix included in accepted release 4.15.0-0.nightly-2024-02-05-163411

yanirq commented 9 months ago

/cherry-pick release-4.14

openshift-cherrypick-robot commented 9 months ago

@yanirq: #928 failed to apply on top of branch "release-4.14":

Applying: NTO: Add MCP name to filter PP (#878)
Using index info to reconstruct a base tree...
A   pkg/tuned/cmd/render/cmd.go
A   pkg/tuned/cmd/render/render.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/tuned/cmd/render/render.go deleted in HEAD and modified in NTO: Add MCP name to filter PP (#878). Version NTO: Add MCP name to filter PP (#878) of pkg/tuned/cmd/render/render.go left in tree.
Auto-merging pkg/performanceprofile/cmd/render/cmd.go
CONFLICT (content): Merge conflict in pkg/performanceprofile/cmd/render/cmd.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 NTO: Add MCP name to filter PP (#878)
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](https://github.com/openshift/cluster-node-tuning-operator/pull/928#issuecomment-1929366878): >/cherry-pick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-merge-robot commented 9 months ago

Fix included in accepted release 4.15.0-0.nightly-2024-02-12-213938