Skip to content

Commit

Permalink
install/kubernetes: fix helm generation for operator image digest
Browse files Browse the repository at this point in the history
This commit fixes the image digest as part of the operator deployment.

Fixes: 4638de2 ("cleanup the cilium helm chart:")
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Nov 23, 2021
1 parent cb1bf90 commit 1ccb845
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions install/kubernetes/cilium/templates/cilium-operator/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,23 @@
{{- $cloud -}}
{{- end -}}

{{- define "cilium.operator.imageDigestName" -}}
{{- $imageDigest := (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.genericDigest) "" -}}
{{- if .Values.eni.enabled -}}
{{- $imageDigest := (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.awsDigest) "" -}}
{{- else if .Values.azure.enabled -}}
{{- $imageDigest := (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.azureDigest) "" -}}
{{- else if .Values.alibabacloud.enabled -}}
{{- $imageDigest := (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.alibabacloudDigest) "" -}}
{{- end -}}
{{- $imageDigest -}}
{{- end -}}

{{/*
Return cilium operator image
*/}}
{{- define "cilium.operator.image" -}}
{{- $cloud := include "cilium.operator.cloud" . }}
{{- $digest := (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.digest) "" -}}
{{- printf "%s-%s%s:%s%s" .Values.operator.image.repository $cloud .Values.operator.image.suffix .Values.operator.image.tag $digest -}}
{{- $imageDigest := include "cilium.operator.imageDigestName" . }}
{{- printf "%s-%s%s:%s%s" .Values.operator.image.repository $cloud .Values.operator.image.suffix .Values.operator.image.tag $imageDigest -}}
{{- end -}}

0 comments on commit 1ccb845

Please sign in to comment.