OCPBUGS-29641: fix rendering extra ctrcfgs

[vitus133]

Fix bootstrap error of "more than one ContainerRuntimeConfig found that matches MCP labels" when an additional ContainerRuntimeConfig is provided by user.

/cc @yanirq @MarSik @Tal-or @ffromani

[openshift-ci-robot]

@vitus133: This pull request references Jira Issue OCPBUGS-29641, which is invalid:

• expected the bug to target the "4.16.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.

In response to this:

Fix bootstrap error of "more than one ContainerRuntimeConfig found that matches MCP labels" when an additional ContainerRuntimeConfig is provided by user.

/cc @yanirq @MarSik @Tal-or @ffromani

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.

[vitus133]

/jira refresh

[openshift-ci-robot]

@vitus133: This pull request references Jira Issue OCPBUGS-29641, 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.16.0) matches configured target version for branch (4.16.0)
• bug is in the state New, 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.

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

[MarSik]

/lgtm

[yanirq]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MarSik, vitus133, 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:

• OWNERS [MarSik,yanirq]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[MarSik]

/retest-required

[MarSik]

The only failing test is "fail [github.com/openshift/origin/test/extended/operators/images.go:53]: unable to decode release payload with error: invalid character 'w' looking for beginning of value" and that is for sure not related to this change.

[MarSik]

/override ci/prow/e2e-aws-ovn

[openshift-ci]

@MarSik: Overrode contexts on behalf of MarSik: ci/prow/e2e-aws-ovn

In response to this:

/override ci/prow/e2e-aws-ovn

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]

@vitus133: Jira Issue OCPBUGS-29641: All pull requests linked via external trackers have merged:

• openshift/cluster-node-tuning-operator#972

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

In response to this:

Fix bootstrap error of "more than one ContainerRuntimeConfig found that matches MCP labels" when an additional ContainerRuntimeConfig is provided by user.

/cc @yanirq @MarSik @Tal-or @ffromani

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]

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

[yanirq]

@vitus133 does this require a backport ? (if so then to what version?)

[MarSik]

Yes it does. I would say we have the bug in 4.14 for sure https://github.com/openshift/cluster-node-tuning-operator/blob/release-4.14/pkg/performanceprofile/cmd/render/render.go#L337

[MarSik]

As well as in 4.13., 4.12 does not have it.

[MarSik]

/cherry-pick release-4.15

[openshift-cherrypick-robot]

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

Applying: OCPBUGS-29641: fix rendering extra ctrcfgs
Using index info to reconstruct a base tree...
M	pkg/performanceprofile/cmd/render/render.go
M	test/e2e/performanceprofile/functests-render-command/1_render_command/render_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests-render-command/1_render_command/render_test.go
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/functests-render-command/1_render_command/render_test.go
Auto-merging pkg/performanceprofile/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 0001 OCPBUGS-29641: fix rendering extra ctrcfgs
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.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.

[openshift-bot]

[ART PR BUILD NOTIFIER]

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

[openshift-merge-robot]

Fix included in accepted release 4.16.0-0.nightly-2024-03-05-105513