New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OCPBUGS-18326: add Console cap annotation to dashboards #2254
OCPBUGS-18326: add Console cap annotation to dashboards #2254
Conversation
This commit adds the "capability.openshift.io/name: Console" annotation to the dashboard configmaps. It also renames the existing configmaps from "grafana-xxx" to "xxx" because otherwise CVO would enable the Console capability on all clusters, even those where the capability was initially disabled [1]. The CVO team has a feature request [2] to improve the situation but for now, we have no other option than creating the configmaps with a different name and deleting the old configmaps (anyway the "grafana-" prefix is misleading since OCP doesn't ship any Grafana instance by default). [1] https://github.com/openshift/enhancements/blob/master/enhancements/installer/component-selection.md#how-to-implement-a-new-capability [2] https://issues.redhat.com/browse/OTA-1039 Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier: This pull request references Jira Issue OCPBUGS-18326, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
/jira refresh |
@simonpasquier: This pull request references Jira Issue OCPBUGS-18326, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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. |
@simonpasquier: The following tests failed, say
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. |
Nice, thank you! Love the commit message ❤️ /lgtm |
/skip |
Thanks |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jan--f, machine424, simonpasquier 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:
Approvers can indicate their approval by writing |
@simonpasquier: Jira Issue OCPBUGS-18326: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-18326 has been moved to the MODIFIED state. In response to this:
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. |
[ART PR BUILD NOTIFIER] This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202402071412.p0.gdbcfed9.assembly.stream.el9 for distgit cluster-monitoring-operator. |
Fix included in accepted release 4.16.0-0.nightly-2024-02-08-025333 |
This commit adds the "capability.openshift.io/name: Console" annotation to the dashboard configmaps.
It also renames the existing configmaps from "grafana-xxx" to "xxx" because otherwise CVO would enable the Console capability on all clusters, even those where the capability was initially disabled [1]. The CVO team has a feature request [2] to improve the situation but for now, we have no other option than creating the configmaps with a different name and deleting the old configmaps (anyway the "grafana-" prefix is misleading since OCP doesn't ship any Grafana instance by default).
[1] https://github.com/openshift/enhancements/blob/master/enhancements/installer/component-selection.md#how-to-implement-a-new-capability
[2] https://issues.redhat.com/browse/OTA-1039