revert: use configMapRef instead of secretRef
ConfigMap is managed externally and contains all required env vars. Keeping envFrom + configMapRef injection pattern.
This commit is contained in:
parent
b7b56938aa
commit
d4c9759a7e
@ -36,7 +36,7 @@ spec:
|
|||||||
containerPort: {{ .Values.app.service.port }}
|
containerPort: {{ .Values.app.service.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ include "gitdata.fullname" . }}-secrets
|
name: {{ include "gitdata.fullname" . }}-secrets
|
||||||
{{- range .Values.app.env }}
|
{{- range .Values.app.env }}
|
||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
|
|||||||
@ -31,7 +31,7 @@ spec:
|
|||||||
image: "{{ .Values.image.registry }}/{{ .Values.emailWorker.image.repository }}:{{ .Values.emailWorker.image.tag }}"
|
image: "{{ .Values.image.registry }}/{{ .Values.emailWorker.image.repository }}:{{ .Values.emailWorker.image.tag }}"
|
||||||
imagePullPolicy: {{ .Values.emailWorker.image.pullPolicy | default .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.emailWorker.image.pullPolicy | default .Values.image.pullPolicy }}
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ include "gitdata.fullname" . }}-secrets
|
name: {{ include "gitdata.fullname" . }}-secrets
|
||||||
{{- range .Values.emailWorker.env }}
|
{{- range .Values.emailWorker.env }}
|
||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
|
|||||||
@ -31,7 +31,7 @@ spec:
|
|||||||
image: "{{ .Values.image.registry }}/{{ .Values.gitHook.image.repository }}:{{ .Values.gitHook.image.tag }}"
|
image: "{{ .Values.image.registry }}/{{ .Values.gitHook.image.repository }}:{{ .Values.gitHook.image.tag }}"
|
||||||
imagePullPolicy: {{ .Values.gitHook.image.pullPolicy | default .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.gitHook.image.pullPolicy | default .Values.image.pullPolicy }}
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ include "gitdata.fullname" . }}-secrets
|
name: {{ include "gitdata.fullname" . }}-secrets
|
||||||
{{- range .Values.gitHook.env }}
|
{{- range .Values.gitHook.env }}
|
||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
|
|||||||
@ -45,7 +45,7 @@ spec:
|
|||||||
containerPort: {{ $svc.service.ssh.port }}
|
containerPort: {{ $svc.service.ssh.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ $fullName }}-secrets
|
name: {{ $fullName }}-secrets
|
||||||
env:
|
env:
|
||||||
- name: APP_REPOS_ROOT
|
- name: APP_REPOS_ROOT
|
||||||
|
|||||||
@ -30,7 +30,7 @@ spec:
|
|||||||
image: "{{ .Values.image.registry }}/{{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag }}"
|
image: "{{ .Values.image.registry }}/{{ .Values.operator.image.repository }}:{{ .Values.operator.image.tag }}"
|
||||||
imagePullPolicy: {{ .Values.operator.image.pullPolicy | default .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.operator.image.pullPolicy | default .Values.image.pullPolicy }}
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ include "gitdata.fullname" . }}-secrets
|
name: {{ include "gitdata.fullname" . }}-secrets
|
||||||
env:
|
env:
|
||||||
- name: OPERATOR_IMAGE_PREFIX
|
- name: OPERATOR_IMAGE_PREFIX
|
||||||
|
|||||||
@ -41,7 +41,7 @@ spec:
|
|||||||
containerPort: {{ $svc.service.port }}
|
containerPort: {{ $svc.service.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- configMapRef:
|
||||||
name: {{ $fullName }}-secrets
|
name: {{ $fullName }}-secrets
|
||||||
env:
|
env:
|
||||||
- name: STATIC_ROOT
|
- name: STATIC_ROOT
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user