diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-05-12 12:53:50 +0200 |
|---|---|---|
| committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-05-29 01:22:26 +0200 |
| commit | 48eaa240290bb1bbf1117e8411f560c446d4aefc (patch) | |
| tree | 3e70cb3bd7ccb81903f644956e30d13b631d72f4 /kubernetes/sdnc/templates/statefulset.yaml | |
| parent | d72adb3e19a820173f42572c0794b1b971c76ab8 (diff) | |
[SDNC] Use common aaf template in sdnc
Instead of copy-pasting code around aaf_agent usage let's use a common
template that automates this.
Issue-ID: AAF-1134
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I66886290a1a13ca1c1d924b4d1128adc293b301c
Diffstat (limited to 'kubernetes/sdnc/templates/statefulset.yaml')
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 58ca866fca..6b2f6628f3 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -91,18 +91,16 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - {{ if .Values.global.aafEnabled }} -{{ include "common.aaf-config" . | indent 6 }} - {{ end }} + +{{ include "common.certInitializer.initContainer" . | indent 6 }} + - name: {{ include "common.name" . }}-chown image: "busybox" - command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} ; chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certpersistence.certPath }}"] + command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} ; chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}"] volumeMounts: +{{ include "common.certInitializer.volumeMount" . | indent 10 }} - mountPath: {{ .Values.persistence.mdsalPath }} name: {{ include "common.fullname" . }}-data -{{- if .Values.global.aafEnabled }} -{{ include "common.aaf-config-volume-mountpath" . | indent 10 }} -{{- end }} containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" @@ -151,9 +149,7 @@ spec: - name: JAVA_HOME value: "{{ .Values.config.javaHome}}" volumeMounts: - {{- if .Values.global.aafEnabled }} -{{ include "common.aaf-config-volume-mountpath" . | indent 10 }} - {{- end }} +{{ include "common.certInitializer.volumeMount" . | indent 10 }} - mountPath: /etc/localtime name: localtime readOnly: true @@ -257,9 +253,7 @@ spec: - name: {{ include "common.fullname" . }}-data emptyDir: {} {{ else }} - {{- if .Values.global.aafEnabled }} -{{ include "common.aaf-config-volumes" . | indent 8 }} - {{- end }} +{{ include "common.certInitializer.volumes" . | nindent 8 }} volumeClaimTemplates: - metadata: name: {{ include "common.fullname" . }}-data |