X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=charts%2Ftemplates%2Fdeployment.yaml;h=09765125b15904340dba7d31758903a436ebb557;hb=3bef88acd104bff9c4dc46d3ee55ef370dbe0d35;hp=5f64ccbfbd04505fcbc612d746bf334c2074e1f9;hpb=1c020c705baa0a2a55591750c0fd46fff52a6929;p=pti%2Fo2.git

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 5f64ccb..0976512 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -49,10 +49,14 @@ spec:
               value: o2ims123
             - name: POSTGRES_USER
               value: o2ims
+            - name: PGDATA
+              value: /var/lib/postgresql/data/pgdata
           command: ["/bin/bash", "/opt/postgres_start.sh"]
           volumeMounts:
             - name: scripts
               mountPath: /opt
+            - name: db-pv
+              mountPath: /var/lib/postgresql/data
         - name: redis
           image: redis:alpine
           ports:
@@ -82,6 +86,13 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
+            - name: applicationconfig
+              mountPath: /configs/o2app.conf
+              subPath: config.json
+              readOnly: true
+            - name: smocacrt
+              mountPath: /configs/smoca.crt
+              subPath: config.json
         - name: watcher
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
           command: ["/bin/bash", "/opt/o2watcher_start.sh"]
@@ -107,6 +118,10 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
+            - name: applicationconfig
+              mountPath: /configs/o2app.conf
+              subPath: config.json
+              readOnly: true
         - name: o2api
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
           ports:
@@ -145,14 +160,15 @@ spec:
               mountPath: /configs/o2app.conf
               subPath: config.json
               readOnly: true
-            - name: caconfig
-              mountPath: /configs/ca.cert
+            - name: servercrt
+              mountPath: /configs/server.crt
               subPath: config.json
               readOnly: true
-            - name: serverkeyconfig
+            - name: serverkey
               mountPath: /configs/server.key
               subPath: config.json
               readOnly: true
+        {{- if .Values.o2dms.helm_cli_enable }}
         - name: helmcli
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
           ports:
@@ -166,6 +182,7 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
+        {{- end }}
       volumes:
         - name: scripts
           configMap:
@@ -176,10 +193,15 @@ spec:
             name: {{ .Chart.Name }}-application-config
           name: applicationconfig
         - configMap:
-            name: {{ .Chart.Name }}-serverkeyconfig
-          name: serverkeyconfig
+            name: {{ .Chart.Name }}-serverkey
+          name: serverkey
         - configMap:
-            name: {{ .Chart.Name }}-caconfig
-          name: caconfig
+            name: {{ .Chart.Name }}-servercrt
+          name: servercrt
+        - configMap:
+            name: {{ .Chart.Name }}-smocacrt
+          name: smocacrt
+        - name: db-pv
+          persistentVolumeClaim:
+            claimName: {{ .Chart.Name }}-db-pv
 ---
-