LOG-2693: Fix matching labels selectors for servicemonitors

[periklis]

Description

This PR provides a fix that omits merging the Elasticsearch CR into the Elasticsearch ServiceMonitor labels selectors, e.g. the jaeger operator creates Elasticsearch CRs with custom labels (See jaeger-operator.

ServiceMonitor for ES via Jaeger CR showing up again:

/cc @Red-GV

/cherry-pick release-5.4

Links

• JIRA: https://issues.redhat.com/browse/LOG-2693

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: periklis

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 [periklis]

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

[openshift-ci]

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

[Red-GV]

/lgtm

[Red-GV]

/cherry-pick release-5.4

[openshift-cherrypick-robot]

@Red-GV: new pull request created: #895

In response to this:

/cherry-pick release-5.4

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.