Fix imageId assignment if alloy is disabled (#828)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Oct 30, 2024 · edf683a · edf683a
1 parent a4038f9
commit edf683a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/k8s-monitoring-v1/docs/examples/logs-journal/output.yaml b/charts/k8s-monitoring-v1/docs/examples/logs-journal/output.yaml
@@ -1130,7 +1130,7 @@ spec:
           value: arm64
   containers:
     - name: alloy
-      image: "docker.io/grafana/alloy:%!s(<nil>)"
+      image: "docker.io/grafana/alloy:v1.4.2"
       command:
       - bash
       - -c

diff --git a/charts/k8s-monitoring-v1/docs/examples/logs-only/output.yaml b/charts/k8s-monitoring-v1/docs/examples/logs-only/output.yaml
@@ -1182,7 +1182,7 @@ spec:
           value: arm64
   containers:
     - name: alloy
-      image: "docker.io/grafana/alloy:%!s(<nil>)"
+      image: "docker.io/grafana/alloy:v1.4.2"
       command:
       - bash
       - -c

diff --git a/charts/k8s-monitoring-v1/templates/hooks/validate-configuration.yaml b/charts/k8s-monitoring-v1/templates/hooks/validate-configuration.yaml
@@ -44,7 +44,7 @@ spec:
   {{- end }}
   containers:
     - name: alloy
-      image: "{{ .Values.global.image.registry | default (index .Values $enabledAlloy).image.registry }}/{{ (index .Values $enabledAlloy).image.repository }}{{ include "alloy.imageId" .Subcharts.alloy }}"
+      image: "{{ .Values.global.image.registry | default (index .Values $enabledAlloy).image.registry }}/{{ (index .Values $enabledAlloy).image.repository }}{{ include "alloy.imageId" (index .Subcharts $enabledAlloy) }}"
       command:
       - bash
       - -c