summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/components/sdc-be/templates
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/sdc/components/sdc-be/templates')
-rw-r--r--kubernetes/sdc/components/sdc-be/templates/deployment.yaml28
-rw-r--r--kubernetes/sdc/components/sdc-be/templates/job.yaml1
2 files changed, 17 insertions, 12 deletions
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 5a5fcd6f75..24f169a5b9 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -98,9 +98,9 @@ spec:
cpu: 3m
memory: 20Mi
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
- - name: {{ include "common.fullname" . }}-environments
+ - name: sdc-environments-input
mountPath: /config-input/
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /config-output/
{{- end }}
containers:
@@ -160,20 +160,22 @@ spec:
fieldRef:
fieldPath: status.podIP
volumeMounts:
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/environments/
- - name: sdc-environments-output
+ {{- if .Values.global.aafEnabled }}
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.p12
subPath: org.onap.sdc.p12
- - name: sdc-environments-output
+ - name: sdc-environments
mountPath: /app/jetty/chef-solo/cookbooks/sdc-catalog-be/files/default/org.onap.sdc.trust.jks
subPath: org.onap.sdc.trust.jks
- - name: {{ include "common.fullname" . }}-localtime
+ {{- end }}
+ - name: localtime
mountPath: /etc/localtime
readOnly: true
- name: logs
mountPath: /var/log/onap
- - name: {{ include "common.fullname" . }}-logback
+ - name: logback
mountPath: /tmp/logback.xml
subPath: logback.xml
lifecycle:
@@ -184,19 +186,21 @@ spec:
{{ include "common.log.sidecar" . | nindent 8 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
- - name: {{ include "common.fullname" . }}-localtime
+ - name: localtime
hostPath:
path: /etc/localtime
{{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }}
- - name: {{ include "common.fullname" . }}-logback
+ - name: logback
configMap:
name : {{ include "common.fullname" . }}-logging-configmap
- - name: {{ include "common.fullname" . }}-environments
+ - name: sdc-environments
+ {{- if .Values.global.aafEnabled }}
+ emptyDir: { medium: "Memory" }
+ - name: sdc-environments-input
+ {{- end }}
configMap:
name: {{ include "common.release" . }}-sdc-environments-configmap
defaultMode: 0755
- - name: sdc-environments-output
- emptyDir: { medium: "Memory" }
- name: logs
emptyDir: {}
imagePullSecrets:
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index aaf8fada28..5f70991e6f 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -79,6 +79,7 @@ spec:
requests:
cpu: 200m
memory: 200Mi
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap: