mirror of https://git.rancher.io/charts
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
--- charts-original/templates/controller-deployment.yaml
|
|
+++ charts/templates/controller-deployment.yaml
|
|
@@ -79,23 +79,7 @@
|
|
{{- end }}
|
|
containers:
|
|
- name: neuvector-controller-pod
|
|
- {{- if .Values.global.azure.enabled }}
|
|
- image: "{{ .Values.global.azure.images.controller.registry }}/{{ .Values.global.azure.images.controller.image }}@{{ .Values.global.azure.images.controller.digest }}"
|
|
- {{- else }}
|
|
- {{- if eq .Values.registry "registry.neuvector.com" }}
|
|
- {{- if .Values.oem }}
|
|
- image: "{{ .Values.registry }}/{{ .Values.oem }}/controller:{{ .Values.tag }}"
|
|
- {{- else }}
|
|
- image: "{{ .Values.registry }}/controller:{{ .Values.tag }}"
|
|
- {{- end }}
|
|
- {{- else }}
|
|
- {{- if .Values.controller.image.hash }}
|
|
- image: "{{ .Values.registry }}/{{ .Values.controller.image.repository }}@{{ .Values.controller.image.hash }}"
|
|
- {{- else }}
|
|
- image: "{{ .Values.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.tag }}"
|
|
- {{- end }}
|
|
- {{- end }}
|
|
- {{- end }}
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
|
|
securityContext:
|
|
privileged: true
|
|
resources:
|
|
@@ -132,18 +116,6 @@
|
|
- name: CTRL_PERSIST_CONFIG
|
|
value: "1"
|
|
{{- end }}
|
|
- {{- if .Values.global.aws.enabled }}
|
|
- - name: CSP_ENV
|
|
- value: "aws"
|
|
- {{- end }}
|
|
- {{- if .Values.global.azure.enabled }}
|
|
- - name: CSP_ENV
|
|
- value: "azure"
|
|
- {{- end }}
|
|
- {{- if or .Values.global.aws.enabled .Values.global.azure.enabled }}
|
|
- - name: NO_DEFAULT_ADMIN
|
|
- value: "1"
|
|
- {{- end }}
|
|
{{- with .Values.controller.env }}
|
|
{{- toYaml . | nindent 12 }}
|
|
{{- end }}
|