Skip to content

Conversation

@eggfoobar
Copy link
Contributor

added ability to use the default rmaster worker mcp labels for rendering during boostrap

/hold

@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 Oct 18, 2023
@eggfoobar eggfoobar force-pushed the fix-bootstrap-no-mcp-render branch from 6795b56 to 085b2c6 Compare October 19, 2023 02:08
@eggfoobar eggfoobar changed the title fix: add default MCP objects for rendering [WIP] fix: add default MCP objects for rendering Oct 19, 2023
@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 Oct 19, 2023
@MarSik
Copy link
Contributor

MarSik commented Oct 19, 2023

@eggfoobar I like the direction, but we should open a bug for this to allow backports and probably make the commit messages a bit nicer.

@MarSik
Copy link
Contributor

MarSik commented Oct 19, 2023

/retitle OCPBUGS-22095: [WIP] Add default MCP objects for rendering

@openshift-ci openshift-ci bot changed the title [WIP] fix: add default MCP objects for rendering OCPBUGS-22095: [WIP] Add default MCP objects for rendering Oct 19, 2023
@openshift-ci-robot openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Oct 19, 2023
@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 Oct 19, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 19, 2023
@openshift-ci-robot
Copy link
Contributor

@eggfoobar: This pull request references Jira Issue OCPBUGS-22095, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

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.

Details

In response to this:

added ability to use the default rmaster worker mcp labels for rendering during boostrap

/hold

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.

@MarSik
Copy link
Contributor

MarSik commented Oct 19, 2023

/jira refresh

@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 Oct 19, 2023
@openshift-ci-robot
Copy link
Contributor

@MarSik: This pull request references Jira Issue OCPBUGS-22095, 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.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)

Requesting review from QA contact:
/cc @gsr-shanks

Details

In response to this:

/jira refresh

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 removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 19, 2023
@openshift-ci openshift-ci bot requested a review from gsr-shanks October 19, 2023 07:27
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 18, 2023
@eggfoobar eggfoobar force-pushed the fix-bootstrap-no-mcp-render branch from 085b2c6 to 800c055 Compare January 8, 2024 12:12
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 8, 2024
@eggfoobar eggfoobar force-pushed the fix-bootstrap-no-mcp-render branch from 91c935e to d8645e9 Compare January 9, 2024 21:02
@eggfoobar eggfoobar force-pushed the fix-bootstrap-no-mcp-render branch from d8645e9 to 90d2bca Compare January 10, 2024 10:15
@jlojosnegros
Copy link
Contributor

I will prefer a better error handling than returning "ok" when there is no PP but other than that LGTM.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

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

Copy link
Contributor

@MarSik MarSik left a comment

Choose a reason for hiding this comment

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

/lgtm

@ffromani
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 17, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, MarSik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Jan 17, 2024
@ffromani
Copy link
Contributor

ffromani commented Jan 17, 2024

/cc @jmencak

because it impacts non-perfprof code

@ffromani
Copy link
Contributor

/hold

@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 Jan 17, 2024
@jmencak
Copy link
Contributor

jmencak commented Jan 17, 2024

/cc @jmencak

because it impacts non-perfprof code

Thank you Francesco. I don't have a problem with this change.
/hold cancel

@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 Jan 17, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 098f41e into openshift:master Jan 17, 2024
@openshift-ci-robot
Copy link
Contributor

@eggfoobar: Jira Issue OCPBUGS-22095: All pull requests linked via external trackers have merged:

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

Details

In response to this:

added ability to use the default rmaster worker mcp labels for rendering during boostrap

/hold

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

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

@MarSik
Copy link
Contributor

MarSik commented Jan 22, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot

@MarSik: #833 failed to apply on top of branch "release-4.15":

Applying: feat: update render command to create default MCPs
Applying: feat: add default mcpools to tuned renderer
Using index info to reconstruct a base tree...
M	pkg/tuned/cmd/render/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/tuned/cmd/render/render.go
CONFLICT (content): Merge conflict in pkg/tuned/cmd/render/render.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 feat: add default mcpools to tuned renderer
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".

Details

In response to this:

/cherry-pick release-4.15

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.

MarSik pushed a commit to MarSik/cluster-node-tuning-operator that referenced this pull request Jan 25, 2024
* feat: update render command to create default MCPs

added default MCP creation to help correctly render out the resources for performance profile to use

Signed-off-by: ehila <[email protected]>

upkeep: fix spelling

Signed-off-by: ehila <[email protected]>

* feat: add default mcpools to tuned renderer

Signed-off-by: ehila <[email protected]>

---------

Signed-off-by: ehila <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Feb 5, 2024
* NTO: Add MCP name to filter PP (#878)

render-bootcmd-mc can only compute the kernel args for a
MachineConfigPool that matches the node it is executed on, so we add the
MachineConfigPool name as input parameter to filter the applicable
PerformanceProfiles.

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>

* OCPBUGS-22095: Add default MCP objects for rendering (#833)

* feat: update render command to create default MCPs

added default MCP creation to help correctly render out the resources for performance profile to use

Signed-off-by: ehila <[email protected]>

upkeep: fix spelling

Signed-off-by: ehila <[email protected]>

* feat: add default mcpools to tuned renderer

Signed-off-by: ehila <[email protected]>

---------

Signed-off-by: ehila <[email protected]>

* Enhance render sync to include bootstrap rendering tests

* Render MC without additional PP

This command should render a MC from the available sources.
PerformanceProfile is a source, but it is not mandatory.

So, as there are scenarios where this command should work with no
additional PP let's the command proceed even if there is no PP

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>

* Render sync

---------

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>
Signed-off-by: ehila <[email protected]>
Co-authored-by: Jose Luis Ojosnegros <[email protected]>
Co-authored-by: E Hila <[email protected]>
rbaturov pushed a commit to rbaturov/cluster-node-tuning-operator that referenced this pull request Feb 28, 2024
…ift#928)

* NTO: Add MCP name to filter PP (openshift#878)

render-bootcmd-mc can only compute the kernel args for a
MachineConfigPool that matches the node it is executed on, so we add the
MachineConfigPool name as input parameter to filter the applicable
PerformanceProfiles.

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>

* OCPBUGS-22095: Add default MCP objects for rendering (openshift#833)

* feat: update render command to create default MCPs

added default MCP creation to help correctly render out the resources for performance profile to use

Signed-off-by: ehila <[email protected]>

upkeep: fix spelling

Signed-off-by: ehila <[email protected]>

* feat: add default mcpools to tuned renderer

Signed-off-by: ehila <[email protected]>

---------

Signed-off-by: ehila <[email protected]>

* Enhance render sync to include bootstrap rendering tests

* Render MC without additional PP

This command should render a MC from the available sources.
PerformanceProfile is a source, but it is not mandatory.

So, as there are scenarios where this command should work with no
additional PP let's the command proceed even if there is no PP

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>

* Render sync

---------

Signed-off-by: Jose Luis Ojosnegros Manchón <[email protected]>
Signed-off-by: ehila <[email protected]>
Co-authored-by: Jose Luis Ojosnegros <[email protected]>
Co-authored-by: E Hila <[email protected]>
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-moderate Referenced Jira bug's severity is moderate 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.