Skip to content

Commit b9a316e

Browse files
authored
feat: add support for image digests (splunk#792)
1 parent ebc676a commit b9a316e

File tree

3 files changed

+16
-0
lines changed
  • helm-chart/splunk-connect-for-kubernetes/charts

3 files changed

+16
-0
lines changed

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,12 @@ Create the name of the service account to use
155155
Create the image name
156156
*/}}
157157
{{- define "splunk-kubernetes-logging.image" -}}
158+
{{- if contains .Values.image.tag "sha256" -}}
159+
{{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
160+
{{- else -}}
158161
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
159162
{{- end -}}
163+
{{- end -}}
160164

161165
{{/* evaluate field consume_chunk_on_4xx_errors */}}
162166
{{- define "splunk-kubernetes-logging.should_consume_chunk_on_4xx_errors" -}}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/_helpers.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,22 @@ Create the name of the service account to use
5757
Create the image name
5858
*/}}
5959
{{- define "splunk-kubernetes-metrics.image" -}}
60+
{{- if contains .Values.image.tag "sha256" -}}
61+
{{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
62+
{{- else -}}
6063
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
6164
{{- end -}}
65+
{{- end -}}
6266
{{/*
6367
Create the aggregate image name
6468
*/}}
6569
{{- define "splunk-kubernetes-metrics.imageAgg" -}}
70+
{{- if contains .Values.imageAgg.tag "sha256" -}}
71+
{{- printf "%s/%s@%s" .Values.imageAgg.registry .Values.imageAgg.name .Values.imageAgg.tag -}}
72+
{{- else -}}
6673
{{- printf "%s/%s:%s" .Values.imageAgg.registry .Values.imageAgg.name .Values.imageAgg.tag -}}
6774
{{- end -}}
75+
{{- end -}}
6876

6977
{{/* evaluate field consume_chunk_on_4xx_errors */}}
7078
{{- define "splunk-kubernetes-metrics.should_consume_chunk_on_4xx_errors" -}}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,12 @@ Rules:
8686
Create the image name
8787
*/}}
8888
{{- define "splunk-kubernetes-objects.image" -}}
89+
{{- if contains .Values.image.tag "sha256" -}}
90+
{{- printf "%s/%s@%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
91+
{{- else -}}
8992
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.name .Values.image.tag -}}
9093
{{- end -}}
94+
{{- end -}}
9195

9296
{{/* evaluate field consume_chunk_on_4xx_errors */}}
9397
{{- define "splunk-kubernetes-objects.should_consume_chunk_on_4xx_errors" -}}

0 commit comments

Comments
 (0)