summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/dgbuilder/templates
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-07-15 17:31:43 -0400
committerDan Timoney <dtimoney@att.com>2020-09-17 19:20:48 -0400
commitcb0a81fdf8cddb1f08616d8afdefb69202dcbed3 (patch)
tree61857fc3cd63f2a0de05cedb271b9bb158efc63e /kubernetes/common/dgbuilder/templates
parent6a5cf9898f992ea29a932988717336a036d03228 (diff)
[CCSDK] Configure dgbuilder to use certInitializer
This change makes the following fixes to dgbuilder: * Replace hard-coded certificate with certificate generated by certInitializer * Configure dgbuilder to use http instead of https if AAF is disabled (i.e. global aafEnabled property = false) * Add resource limits Issue-ID: SDNC-1356 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I8ca97c6a44f62a0abe5b5a6f8564ebcd2e4addb1
Diffstat (limited to 'kubernetes/common/dgbuilder/templates')
-rw-r--r--kubernetes/common/dgbuilder/templates/deployment.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index 1c32e12204..ec088e9274 100644
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
@@ -70,6 +70,7 @@ spec:
image: "{{ .Values.global.envsubstImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
+{{ include "common.certInitializer.initContainer" . | indent 6 }}
- command:
- /app/ready.py
args:
@@ -89,7 +90,7 @@ spec:
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/bin/bash"]
- args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"]
+ args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && {{ if .Values.global.aafEnabled}} cp /opt/app/osaaf/local/node-*.pem certs && {{end}}./start.sh sdnc1.0 && wait"]
ports:
- containerPort: {{ .Values.service.internalPort }}
readinessProbe:
@@ -101,6 +102,7 @@ spec:
- name: SDNC_CONFIG_DIR
value: /opt/onap/sdnc/data/properties
volumeMounts:
+{{ include "common.certInitializer.volumeMount" . | indent 10 }}
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -127,6 +129,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
volumes:
+{{ include "common.certInitializer.volumes" . | nindent 8 }}
- name: localtime
hostPath:
path: /etc/localtime