Bug 1910259: Fix missing grafana dashboard in OCP 4.7

[huikang]

• Fix cross-namespace owner reference for the configmap
• Remove configmap after CR being deleted

Description

OCP 4.7 (k8s v1.20) does not allow cross-namespace owner reference. So the configmap is garbage collected due to invalid reference. This PR fixes the issue.

/cc @blockloop
/assign @ewolinetz

Links

• Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1910259

[openshift-ci-robot]

@huikang: This pull request references Bugzilla bug 1910259, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.7.0) matches configured target release for branch (4.7.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1910259: Fix missing grafana 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.

[openshift-ci-robot]

@huikang: This pull request references Bugzilla bug 1910259, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.7.0) matches configured target release for branch (4.7.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1910259: Fix missing grafana dashboard in OCP 4.7

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.

[huikang]

/retest

[ewolinetz]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ewolinetz, huikang

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

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

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[huikang]

/retest

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-ci-robot]

@huikang: All pull requests linked via external trackers have merged:

• openshift/elasticsearch-operator#610

Bugzilla bug 1910259 has been moved to the MODIFIED state.

In response to this:

Bug 1910259: Fix missing grafana dashboard in OCP 4.7

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.

[huikang]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@huikang: #610 failed to apply on top of branch "release-4.6":

Applying: Bug 1910259: Fix missing grafana dashboard
Using index info to reconstruct a base tree...
A	controllers/logging/elasticsearch_controller.go
A	internal/k8shandler/dashboards.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/k8shandler/dashboards.go
CONFLICT (content): Merge conflict in pkg/k8shandler/dashboards.go
CONFLICT (modify/delete): controllers/logging/elasticsearch_controller.go deleted in HEAD and modified in Bug 1910259: Fix missing grafana dashboard. Version Bug 1910259: Fix missing grafana dashboard of controllers/logging/elasticsearch_controller.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1910259: Fix missing grafana dashboard
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.6

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.