fix(helm): Move pullSecrets up to pod level

Previously the pullSecrets was defined on container level which is not supported by kubernetes.
This commit is contained in:
deen13 2021-03-16 16:58:19 +01:00 committed by Rory Z
parent a5f0ed0356
commit cac0ee7f84
1 changed files with 10 additions and 10 deletions

View File

@ -88,17 +88,17 @@ spec:
{{- if .Values.initContainers }} {{- if .Values.initContainers }}
initContainers: initContainers:
{{ toYaml .Values.initContainers | indent 8 }} {{ toYaml .Values.initContainers | indent 8 }}
{{- end }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }} {{- end }}
containers: containers:
- name: emqx - name: emqx
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
ports: ports:
- name: mqtt - name: mqtt
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__TCP__EXTERNAL | default 1883 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__TCP__EXTERNAL | default 1883 }}
@ -120,14 +120,14 @@ spec:
containerPort: 4370 containerPort: 4370
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "emqx.fullname" . }}-env name: {{ include "emqx.fullname" . }}-env
env: env:
- name: EMQX_NAME - name: EMQX_NAME
value: {{ .Release.Name }} value: {{ .Release.Name }}
- name: EMQX_CLUSTER__K8S__APP_NAME - name: EMQX_CLUSTER__K8S__APP_NAME
value: {{ .Release.Name }} value: {{ .Release.Name }}
- name: EMQX_CLUSTER__DISCOVERY - name: EMQX_CLUSTER__DISCOVERY
value: k8s value: k8s
- name: EMQX_CLUSTER__K8S__SERVICE_NAME - name: EMQX_CLUSTER__K8S__SERVICE_NAME
value: {{ include "emqx.fullname" . }}-headless value: {{ include "emqx.fullname" . }}-headless
- name: EMQX_CLUSTER__K8S__NAMESPACE - name: EMQX_CLUSTER__K8S__NAMESPACE