Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[AUTHENTICATION] Restructured keycloak and Oauth2-proxy"
[oom.git]
/
kubernetes
/
oof
/
components
/
oof-has
/
components
/
oof-has-controller
/
templates
/
deployment.yaml
diff --git
a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
b/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
index
a7be1ba
..
2367da7
100755
(executable)
--- a/
kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
+++ b/
kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
@@
-55,9
+55,6
@@
spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env: {{ include "oof.etcd.env" . | nindent 10 }}
volumeMounts:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env: {{ include "oof.etcd.env" . | nindent 10 }}
volumeMounts:
- - mountPath: /etc/localtime
- name: localtime
- readOnly: true
- mountPath: /usr/local/bin/conductor.conf
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: conductor.conf
- mountPath: /usr/local/bin/conductor.conf
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: conductor.conf
@@
-78,9
+75,6
@@
spec:
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
{{- end }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- - name: localtime
- hostPath:
- path: /etc/localtime
- name: {{ .Values.global.commonConfigPrefix }}-config
configMap:
name: {{ .Values.global.commonConfigPrefix }}-configmap
- name: {{ .Values.global.commonConfigPrefix }}-config
configMap:
name: {{ .Values.global.commonConfigPrefix }}-configmap
@@
-91,5
+85,4
@@
spec:
path: log.conf
- key: healthy.sh
path: healthy.sh
path: log.conf
- key: healthy.sh
path: healthy.sh
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
+ {{- include "common.imagePullSecrets" . | nindent 6 }}