Skip to content

Removes grafana.image.version field#4571

Merged
alpeb merged 1 commit intomasterfrom
tarun/grafana-image-fix
Jun 8, 2020
Merged

Removes grafana.image.version field#4571
alpeb merged 1 commit intomasterfrom
tarun/grafana-image-fix

Conversation

@Pothulapati
Copy link
Contributor

Fixes #4556

Currently, whenever we perform upgrades, the configuration from linkerd-config-addons is used and overrides the default upgrades. This prevents grafana image tag from being upgraded, when grafana.image.version is present in linkerd-config-addons

The fix is to remove grafana.image.version field, so that users we don't use the value from linkerd-config-addons (which prevents us to upgrade to the latest image).

This means that, users who want to get their own Grafana Image should have the image tagged with the control-plane version.

This does not effect the bring your own Grafana image use-case.

Future Concrete Solution:

  • Do not build grafana image for each tag, just like we don't build other add-on images like jaeger, etc. Thus making Controlplane upgrades separate from grafana image.

Signed-off-by: Tarun Pothulapati [email protected]

Signed-off-by: Tarun Pothulapati <[email protected]>
Copy link
Member

@alpeb alpeb left a comment

Choose a reason for hiding this comment

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

LGTM 👍
Do you mind opening an issue to track the effort/investigation for stop building the grafana image?

Copy link
Contributor

@kleimkuhler kleimkuhler left a comment

Choose a reason for hiding this comment

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

👍

@Pothulapati
Copy link
Contributor Author

Raised #4572

@alpeb alpeb merged commit 4aa3ca7 into master Jun 8, 2020
@alpeb alpeb deleted the tarun/grafana-image-fix branch June 8, 2020 22:15
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.

Upgrading from edge version does not set Grafana control plane version corrrectly

3 participants