OCPBUGS-15440: fix CMO to apply console-plugin pod.spec config

[sthaha]

The console-plugin's deployment configs that need to applied to the deployment.spec.template.spec weren't getting applied because the changes were made to the copy of the object instead of the original object itself. The tests didn't catch the issue because the pod assertions didn't validate if any pods were found for the combination of namespace and label-selector

This commit fixes both by refering (pointer) to the original spec instead of the copy and by fixing the assertions fail if it fails to find any pods.

[openshift-ci-robot]

@sthaha: This pull request references Jira Issue OCPBUGS-15440, which is invalid:

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

The console-plugin's deployment configs that need to applied to the deployment.spec.template.spec weren't getting applied because the changes were made to the copy of the object instead of the original object itself. The tests didn't catch the issue because the pod assertions didn't validate if any pods were found for the combination of namespace and label-selector

This commit fixes both by refering (pointer) to the original spec instead of the copy and by fixing the assertions fail if it fails to find any pods.

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.

[simonpasquier]

/lgtm

note for a follow-up: we can also add a unit test in the manifests package for testing all CMO options related to the monitoring console plugin.

[jan--f]

/jira refresh

[openshift-ci-robot]

@jan--f: This pull request references Jira Issue OCPBUGS-15440, 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)

Requesting review from QA contact:
/cc @Tai-RedHat

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]

/retest-required

Remaining retests: 0 against base HEAD 8d67591 and 2 for PR HEAD edf0ecd in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 7fb0c8f and 1 for PR HEAD edf0ecd in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 2bb7887 and 0 for PR HEAD edf0ecd in total

[openshift-ci-robot]

/hold

Revision edf0ecd was retested 3 times: holding

[sthaha]

/retest-required

[sthaha]

@simonpasquier @jan--f I have removed the assertion that I added that to AssertPodConfiguration to check that at least one pod matches the selector passed.

			if len(pods.Items) == 0 {
				return fmt.Errorf("%w - failed to find Pods in %s matching %s", err, namespace, labelSelector)
			}

due to the following unrelated test failures which may be another bug to fix

=== RUN   TestClusterMonitorOSMConfig/assert_pod_configuration_is_as_expected
    assertions.go:347: timed out waiting for the condition: %!w(<nil>) - failed to find Pods in openshift-monitoring matching k8s-app=openshift-state-metrics
--- FAIL: TestClusterMonitorOSMConfig (307.04s)

    --- PASS: TestClusterMonitorTelemeterClientConfig/test_the_telemeter-client_deployment_is_rolled_out (6.02s)
    --- FAIL: TestClusterMonitorTelemeterClientConfig/assert_pod_configuration_is_as_expected (300.01s)

=== RUN   TestClusterMonitorTelemeterClientConfig/assert_pod_configuration_is_as_expected
    assertions.go:347: timed out waiting for the condition: %!w(<nil>) - failed to find Pods in openshift-monitoring matching app.kubernetes.io/component=dashboard

[sthaha]

Just a note - for osm below are the labels set on an aws 4.14 cluster

app.kubernetes.io/component=exporter
app.kubernetes.io/managed-by=cluster-monitoring-operator
app.kubernetes.io/name=openshift-state-metrics
app.kubernetes.io/part-of=openshift-monitoring
pod-template-hash=6d87776c5f

[sthaha]

/retest-required

[sthaha]

#2028 should fix the issues found while testing this PR.

[sthaha]

/unhold

[marioferh]

/lgtm

[jan--f]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, marioferh, simonpasquier, sthaha

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 [jan--f,marioferh,simonpasquier,sthaha]

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]

/retest-required

Remaining retests: 0 against base HEAD 237cf9a and 2 for PR HEAD 959a0ce in total

[openshift-ci]

@sthaha: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ovn-single-node	959a0ce	link	false	/test e2e-aws-ovn-single-node
ci/prow/versions	959a0ce	link	false	/test versions

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.

[simonpasquier]

/skip
/retest-required

[openshift-ci-robot]

@sthaha: Jira Issue OCPBUGS-15440: All pull requests linked via external trackers have merged:

• openshift/cluster-monitoring-operator#2018

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

In response to this:

The console-plugin's deployment configs that need to applied to the deployment.spec.template.spec weren't getting applied because the changes were made to the copy of the object instead of the original object itself. The tests didn't catch the issue because the pod assertions didn't validate if any pods were found for the combination of namespace and label-selector

This commit fixes both by refering (pointer) to the original spec instead of the copy and by fixing the assertions fail if it fails to find any pods.

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.