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.

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

jsonnet: include rewritten kubernetes-grafana library #1450

Merged
merged 3 commits into from
Oct 22, 2021

Conversation

paulfantom
Copy link
Member

@paulfantom paulfantom commented Oct 20, 2021

Description

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.

Include brancz/kubernetes-grafana#117

Type of change

What type of changes does your code introduce to the kube-prometheus? Put an x in the box that apply.

  • CHANGE (fix or feature that would cause existing functionality to not work as expected)
  • FEATURE (non-breaking change which adds functionality)
  • BUGFIX (non-breaking change which fixes an issue)
  • ENHANCEMENT (non-breaking change which improves existing functionality)
  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Changelog entry

Please put a one-line changelog entry below. Later this will be copied to the changelog file.

Include rewritten kubernetes-grafana for easier usage of new library features

@paulfantom
Copy link
Member Author

This won't work in CI until brancz/kubernetes-grafana#117 is completed.

@paulfantom paulfantom marked this pull request as ready for review October 21, 2021 09:38
@paulfantom
Copy link
Member Author

paulfantom commented Oct 21, 2021

As brancz/kubernetes-grafana#117 was merged, we need this PR to keep up :)

@@ -39,7 +39,7 @@ local utils = import './lib/utils.libsonnet';
images: {
alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
blackboxExporter: 'quay.io/prometheus/blackbox-exporter:v' + $.values.common.versions.blackboxExporter,
grafana: 'grafana/grafana:v' + $.values.common.versions.grafana,
grafana: 'grafana/grafana:' + $.values.common.versions.grafana,
Copy link
Member Author

@paulfantom paulfantom Oct 21, 2021

Choose a reason for hiding this comment

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

It is weird how noone reported this bug 🤔

Copy link
Member

Choose a reason for hiding this comment

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

Well, we do have tests for grafana's deployment right? We would have caught if that was a real problem 🕵️

Copy link
Member Author

Choose a reason for hiding this comment

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

The problem is that such image does not exist, so pod should error out. 🤷

Copy link
Member

@ArthurSens ArthurSens left a comment

Choose a reason for hiding this comment

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

The code looks a lot cleaner now! Thanks a lot for working on this :)

I've just tested by playing around with examples.jsonnet, everything is working as expected

@paulfantom paulfantom merged commit cd044aa into prometheus-operator:main Oct 22, 2021
@paulfantom paulfantom deleted the grafana-refactor branch October 22, 2021 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants