Skip to content
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.

Sign up for GitHub

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

Jump to bottom

NO-JIRA: vendor Kubernetes dashboards #2482

Merged
merged 1 commit into from
Sep 24, 2024
Merged

NO-JIRA: vendor Kubernetes dashboards #2482

merged 1 commit into from
Sep 24, 2024

Conversation

simonpasquier
Copy link
Contributor

@simonpasquier simonpasquier commented Sep 23, 2024 •
edited
Loading

kubernetes-monitoring/kubernetes-mixin is pinned to the latest upstream commit before the project switched to Grafana v11 since it broke the Kubernetes dashboards in the OCP console (see 2399dc8 for details).

This change removes the Kubernetes dashboards from the jsonnet generation code. Instead their current version is copied to the 0000_90_cluster-monitoring-operator_02-dashboards.yaml file under the manifests/ directory. Any future update to these dashboards should be made to the manifest file directly.

A follow-up PR will unpin the kubernetes-monitoring/kubernetes-mixin version.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@simonpasquier
NO-JIRA: vendor Kubernetes dashboards
5f81832 
kubernetes-monitoring/kubernetes-mixin is pinned to the latest upstream
commit before the project switched to Grafana v11 since it broke the
Kubernetes dashboards in the OCP console (see 2399dc8 for details).

This change removes the Kubernetes dashboards from the jsonnet
generation code. Instead their current version is copied to the
`0000_90_cluster-monitoring-operator_02-dashboards.yaml` file under the
`manifests/` directory. Any future update to these dashboards should be
made to the manifest file directly.

A follow-up PR will unpin the kubernetes-monitoring/kubernetes-mixin
version.

Signed-off-by: Simon Pasquier <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 23, 2024
@openshift-ci-robot
Copy link
Contributor

@simonpasquier: This pull request explicitly references no jira issue.

In response to this:

kubernetes-monitoring/kubernetes-mixin is pinned to the latest upstream commit before the project switched to Grafana v11 since it broke the Kubernetes dashboards in the OCP console (see 2399dc8 for details).

This change removes the Kubernetes dashboards from the jsonnet generation code. Instead their current version is copied to the 0000_90_cluster-monitoring-operator_02-dashboards.yaml file under the manifests/ directory. Any future update to these dashboards should be made to the manifest file directly.

A follow-up PR will unpin the kubernetes-monitoring/kubernetes-mixin version.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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
Copy link
Contributor Author

/hold

I want to spin up a test cluster and compare against the current version.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 23, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 23, 2024
@simonpasquier
Copy link
Contributor Author

/hold cancel
tested locally and it seems working.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 23, 2024
@rexagod
Copy link
Member

rexagod commented Sep 23, 2024 •
edited
Loading

/retest
/approve

Unblocks #2422.

@rexagod
Copy link
Member

rexagod commented Sep 23, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD af93eec and 2 for PR HEAD 5f81832 in total

marioferh
marioferh reviewed Sep 23, 2024
View reviewed changes
Copy link
Contributor

@marioferh marioferh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marioferh, rexagod, 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:
  • OWNERS [marioferh,rexagod,simonpasquier]

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
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 9a4e071 and 2 for PR HEAD 5f81832 in total

1 similar comment
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 9a4e071 and 2 for PR HEAD 5f81832 in total

@simonpasquier
Copy link
Contributor Author

/retest-required

1 similar comment
@simonpasquier
Copy link
Contributor Author

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 9a4e071 and 2 for PR HEAD 5f81832 in total

@simonpasquier
Copy link
Contributor Author

/test e2e-hypershift-conformance

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 24, 2024

@simonpasquier: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 9f8c85a into openshift:master Sep 24, 2024
18 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-monitoring-operator
This PR has been included in build cluster-monitoring-operator-container-v4.18.0-202409242009.p0.g9f8c85a.assembly.stream.el9.
All builds following this will include this PR.

@rexagod rexagod mentioned this pull request Oct 7, 2024
Open
2 tasks
@simonpasquier simonpasquier deleted the hardcode-dashboards branch November 19, 2024 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marioferh marioferh marioferh left review comments

@danielmellado danielmellado Awaiting requested review from danielmellado

@rexagod rexagod Awaiting requested review from rexagod

Assignees

@rexagod rexagod

@marioferh marioferh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@simonpasquier @openshift-ci-robot @rexagod @openshift-bot @marioferh