Skip to content

Commit

Permalink
helm: Fix operator cloud image digests
Browse files Browse the repository at this point in the history
Tested by applying this patch to v1.11 branch and validating that the
digest matches the correct cloud image vs. the v1.11.0-rc3 images on
Quay.io:

   $ helm template cilium ./install/kubernetes/cilium/ --version 1.10.0-rc3 \
          --namespace kube-system --set eni.enabled=true --set ipam.mode=eni \
          --set egressMasqueradeInterfaces=eth0 --set tunnel=disabled \
     | grep operator.*sha
          image: quay.io/cilium/operator-aws:v1.11.0-rc3@sha256:5ea0ccb6a866a5fb13f4bdfcf1ed8bce12a1355cb10a0914ea52af25f3a8f931

Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer committed Dec 3, 2021
1 parent a1fdcb9 commit 5cc4f75
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
{{- 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) "" -}}
{{- $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) "" -}}
{{- $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) "" -}}
{{- $imageDigest = (.Values.operator.image.useDigest | default false) | ternary (printf "@%s" .Values.operator.image.alibabacloudDigest) "" -}}
{{- end -}}
{{- $imageDigest -}}
{{- end -}}
Expand Down

0 comments on commit 5cc4f75

Please sign in to comment.