Merge "Fix dmaap-dr-prov deployment failing"

[oom.git] / kubernetes / sdnc / templates / statefulset.yaml

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 8c52e5c..70713cc 100644 (file)
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -95,6 +95,8 @@ spec:
               value: "{{ .Values.replicaCount }}"
             - name: MYSQL_HOST
               value: "{{.Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.name}}.{{.Release.Namespace}}"
+            - name: JAVA_HOME
+              value: "{{ .Values.config.javaHome}}"
           volumeMounts:
           - mountPath: /etc/localtime
             name: localtime
@@ -123,12 +125,18 @@ spec:
           - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
             name: properties
             subPath: svclogic.properties
+          - mountPath: {{ .Values.config.configDir }}/netbox.properties
+            name: properties
+            subPath: netbox.properties
+          - mountPath: {{ .Values.config.configDir }}/blueprints-processor-adaptor.properties
+            name: properties
+            subPath: blueprints-processor-adaptor.properties
           - mountPath: {{ .Values.persistence.mdsalPath }}
             name: {{ include "common.fullname" . }}-mdsal
           - mountPath: /var/log/onap
             name: logs
           resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -189,4 +197,7 @@ spec:
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
   {{ end }}