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

Update Grafana to latest that uses Apache license #1307

Merged
merged 6 commits into from
Jun 28, 2021

Conversation

aiyengar2
Copy link
Contributor

@aiyengar2 aiyengar2 commented Jun 26, 2021

This PR contains changes to shift Grafana's base chart to 6.11.0 of the upstream Helm chart.

It also makes additional changes to bump images beyond what is tracked in upstream, namely:

  • grafana itself (moved to 7.5.8, latest version of 7.5.x line)
  • curl
  • grafana-image-renderer
  • k8s-sidecar

Related Issue: rancher/rancher#33210


@aiyengar2 aiyengar2 requested a review from jiaqiluo June 28, 2021 17:02
Copy link
Member

@jiaqiluo jiaqiluo left a comment

Choose a reason for hiding this comment

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

@aiyengar2 Why do we need to delete the charts for rancher-kube-state-metrics, rancher-node-exporter, and rancher-prometheus-adapter?

@aiyengar2
Copy link
Contributor Author

@aiyengar2 Why do we need to delete the charts for rancher-kube-state-metrics, rancher-node-exporter, and rancher-prometheus-adapter?

TLDR is:

  1. Neither Rebase Monitoring to 16.x.x #1274 or the followup in Remove old Monitoring assets #1290 removed the old assets from the released dependencies
  2. The index.yaml was not updated to point at the right chart with the +up annotation as a result of Istio 1.9.6 #1304 (comment)

@aiyengar2 aiyengar2 requested a review from jiaqiluo June 28, 2021 21:49
Copy link
Member

@jiaqiluo jiaqiluo left a comment

Choose a reason for hiding this comment

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

LGTM

@aiyengar2 aiyengar2 merged commit 47aa362 into rancher:dev-v2.6 Jun 28, 2021
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Oct 5, 2021
Update Grafana to latest that uses Apache license
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Oct 6, 2021
Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Oct 7, 2021
Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Oct 20, 2021
Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Nov 1, 2021
Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Nov 3, 2021
Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
aiyengar2 added a commit to aiyengar2/charts that referenced this pull request Jan 6, 2022
…ate_grafana

Update Grafana to latest that uses Apache license

(partially cherry picked from commit 47aa362)
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.

3 participants