rke2-charts/packages/cilium/generated-changes/patch/templates/cilium-operator-deployment....

31 lines
2.1 KiB
Diff

--- charts-original/templates/cilium-operator-deployment.yaml
+++ charts/templates/cilium-operator-deployment.yaml
@@ -56,9 +56,6 @@
labels:
io.cilium/app: operator
name: cilium-operator
-{{- with .Values.operator.podLabels }}
- {{- toYaml . | nindent 8 }}
-{{- end }}
spec:
# In HA mode, cilium-operator pods must not be scheduled on the same
# node as they will clash with each other.
@@ -171,13 +168,13 @@
value: {{ $value }}
{{- end }}
{{- if .Values.eni.enabled }}
- image: "{{ .Values.operator.image.repository }}-aws{{ .Values.operator.image.suffix }}:{{ .Values.operator.image.tag }}{{ if .Values.operator.image.useDigest }}@{{ .Values.operator.image.awsDigest }}{{ end }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.operator.image.repository }}-aws:{{ .Values.operator.image.tag }}
{{- else if .Values.azure.enabled }}
- image: "{{ .Values.operator.image.repository }}-azure{{ .Values.operator.image.suffix }}:{{ .Values.operator.image.tag }}{{ if .Values.operator.image.useDigest }}@{{ .Values.operator.image.azureDigest }}{{ end }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.operator.image.repository }}-azure:{{ .Values.operator.image.tag }}
{{- else if .Values.alibabacloud.enabled }}
- image: "{{ .Values.operator.image.repository }}-alibabacloud{{ .Values.operator.image.suffix }}:{{ .Values.operator.image.tag }}{{ if .Values.operator.image.useDigest }}@{{ .Values.operator.image.alibabacloudDigest }}{{ end }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.operator.image.repository }}-alibabacloud:{{ .Values.operator.image.tag }}
{{- else }}
- image: "{{ .Values.operator.image.repository }}-generic{{ .Values.operator.image.suffix }}:{{ .Values.operator.image.tag }}{{ if .Values.operator.image.useDigest }}@{{ .Values.operator.image.genericDigest }}{{ end }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.operator.image.repository }}-generic:{{ .Values.operator.image.tag }}
{{- end }}
imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
name: cilium-operator