Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grafana/helm-charts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: grafana-7.0.1
Choose a base ref
...
head repository: grafana/helm-charts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: grafana-7.0.2
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 30, 2023

  1. Add global image registry inheritance support for extraInitContainers 

    Signed-off-by: Philip Vallone <vallonephilip@gmail.com>
    @pvallone
    pvallone committed Oct 30, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cd73d11 View commit details

  2. Bump version (patch) 

    Signed-off-by: Philip Vallone <vallonephilip@gmail.com>
    @pvallone
    pvallone committed Oct 30, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a700858 View commit details

Commits on Oct 31, 2023

  1. Merge pull request #2748 from pvallone/users/pvallone/extra-init-cont… 

    …ainer-global-image-registry

[grafana] Add global image registry support for extraInitContainers
    @zanhsieh
    zanhsieh authored Oct 31, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    d9ef6ab View commit details
Showing with 14 additions and 3 deletions.
  1. +1 −1 charts/grafana/Chart.yaml
  2. +13 −2 charts/grafana/templates/_pod.tpl
2 changes: 1 addition & 1 deletion charts/grafana/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: grafana
version: 7.0.1
version: 7.0.2
appVersion: 10.1.5
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
15 changes: 13 additions & 2 deletions charts/grafana/templates/_pod.tpl
View file
Original file line number Diff line number Diff line change
@@ -222,8 +222,19 @@ initContainers:
- name: sc-notifiers-volume
mountPath: "/etc/grafana/provisioning/notifiers"
{{- end}}
{{- with .Values.extraInitContainers }}
{{- tpl (toYaml .) $root | nindent 2 }}
{{- if .Values.extraInitContainers }}
{{- range $eic := .Values.extraInitContainers }}
- name: {{ $eic.name }}
{{- $registry := $.Values.global.imageRegistry | default $eic.image.registry -}}
{{- if $eic.image.sha }}
image: "{{ $registry }}/{{ $eic.image.repository }}:{{ $eic.image.tag }}@sha256:{{ $eic.image.sha }}"
{{- else }}
image: "{{ $registry }}/{{ $eic.image.repository }}:{{ $eic.image.tag }}"
{{- end }}
imagePullPolicy: {{ $eic.image.pullPolicy }}
volumeMounts:
{{ toYaml $eic.volumeMounts | indent 6 }}
{{- end }}
{{- end }}
{{- if or .Values.image.pullSecrets .Values.global.imagePullSecrets }}
imagePullSecrets: