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

[kube-prometheus-stack] Propagate global.imageRegistry to operator-managed prometheus images #4776

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

omeryahud
Copy link

What this PR does / why we need it

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

Special notes for your reviewer

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

@omeryahud
Copy link
Author

@jkroepke Would appreciate your review, thanks!

Copy link
Member

@jkroepke jkroepke left a comment

Choose a reason for hiding this comment

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

Could you please explain, why this PR solves #4734?

…r-prometheus-images-managed-by-operator

Signed-off-by: Omer Yahud <[email protected]>
@omeryahud
Copy link
Author

Could you please explain, why this PR solves #4734?

Looking at the prometheus-operator deployment, I saw that if .Values.prometheusOperator.prometheusDefaultBaseImage is not provided, .Values.global.imageRegistry is completely ignored.
I also noticed this is the same for all other images, however, all other images had their default in the values file, so I decided to simply align the prometheus image to the rest.

{{- if .Values.prometheusOperator.prometheusDefaultBaseImage }}
- --prometheus-default-base-image={{ .Values.global.imageRegistry | default .Values.prometheusOperator.prometheusDefaultBaseImageRegistry }}/{{ .Values.prometheusOperator.prometheusDefaultBaseImage }}
{{- end }}

@omeryahud
Copy link
Author

Looking at it again, maybe the alert-manager image can receive the same treatment.
If this solution is acceptable, let me know and I'll open a separate PR for it as well

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.

[kube-prometheus-stack] global.ImageRegistry does not affect prometheus image for all instances
2 participants