X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Ftemplates%2Fstatefulset.yaml;h=9728fab52439c2bb7960f2bffe25d206ebef91c2;hb=b76cb2810fc083b6151652083a416989680f17e7;hp=63175c4c4bdb34f8c9feb99c637f8d1cb04a8c92;hpb=f51bdac347ea14d805028fff5fd099eebaab950f;p=oom.git

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 63175c4c4b..9728fab524 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -37,7 +37,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - {{ .Values.mysql.nameOverride }}
+        - {{ .Values.config.mariadbGalera.chartName }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -74,14 +74,29 @@ spec:
                 secretKeyRef:
                   name: {{ template "common.fullname" . }}-odl
                   key: odl-password
+            - name: SDNC_DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "common.fullname" . }}-sdnctl
+                  key: db-sdnctl-password
             - name: SDNC_CONFIG_DIR
               value: "{{ .Values.config.configDir }}"
             - name: ENABLE_ODL_CLUSTER
               value: "{{ .Values.config.enableClustering }}"
+            - name: MY_ODL_CLUSTER
+              value: "{{ .Values.config.myODLCluster }}"
+            - name: PEER_ODL_CLUSTER
+              value: "{{ .Values.config.peerODLCluster }}"
+            - name: IS_PRIMARY_CLUSTER
+              value: "{{ .Values.config.isPrimaryCluster }}"
+            - name: GEO_ENABLED
+              value: "{{ .Values.config.geoEnabled}}"
             - name: SDNC_REPLICAS
               value: "{{ .Values.replicaCount }}"
             - name: MYSQL_HOST
-              value: "{{.Values.mysql.service.name}}.{{.Release.Namespace}}"
+              value: "{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}"
+            - name: JAVA_HOME
+              value: "{{ .Values.config.javaHome}}"
           volumeMounts:
           - mountPath: /etc/localtime
             name: localtime
@@ -101,18 +116,29 @@ spec:
           - mountPath: {{ .Values.config.configDir }}/dblib.properties
             name: properties
             subPath: dblib.properties
+          - mountPath: {{ .Values.config.configDir }}/lcm-dg.properties
+            name: properties
+            subPath: lcm-dg.properties
           - mountPath: {{ .Values.config.configDir }}/svclogic.properties
             name: properties
             subPath: svclogic.properties
           - 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" . }}-data
+            name: {{ include "common.fullname" . }}-mdsal
           - mountPath: /var/log/onap
             name: logs
+          - mountPath: {{ .Values.certpersistence.certPath }}
+            name: {{ include "common.fullname" . }}-certs
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -158,19 +184,29 @@ spec:
           configMap:
             name: {{ include "common.fullname" . }}-properties
             defaultMode: 0644
+        - name: {{ include "common.fullname" . }}-certs
+  {{ if .Values.certpersistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.fullname" . }}-pvc-certs
+  {{ else }}
+          emptyDir: {}
+  {{ end }}
   {{ if not .Values.persistence.enabled }}
-        - name: {{ include "common.fullname" . }}-data
+        - name: {{ include "common.fullname" . }}-mdsal
           emptyDir: {}
   {{ else }}
   volumeClaimTemplates:
   - metadata:
-      name: {{ include "common.fullname" . }}-data
+      name: {{ include "common.fullname" . }}-mdsal
       labels:
         name: {{ include "common.fullname" . }}
     spec:
       accessModes: [ {{ .Values.persistence.accessMode }} ]
-      storageClassName: {{ include "common.fullname" . }}-data
+      storageClassName: {{ include "common.fullname" . }}-mdsal
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
   {{ end }}