X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=charts%2Ftemplates%2Fdeployment.yaml;h=09765125b15904340dba7d31758903a436ebb557;hb=refs%2Fchanges%2F80%2F9480%2F2;hp=5d82063c997731a6b16817da1c85344ca8de3b8f;hpb=5601b5899b0fd15748ae0474de9f5f6dda72864c;p=pti%2Fo2.git

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 5d82063..0976512 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -31,8 +31,10 @@ spec:
         app: o2api
     spec:
       serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
+      # imagePullSecrets:
+      #   - name: {{ .Values.o2ims.imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ .Values.o2ims.imagePullSecrets }}
+        - name: {{ .Values.o2ims.serviceaccountname }}-registry-secret
 {{- if .Values.o2ims.affinity }}
       affinity:
 {{ toYaml .Values.o2ims.affinity | indent 8 }}
@@ -47,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:
@@ -80,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"]
@@ -105,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:
@@ -117,7 +134,7 @@ spec:
             - name: DB_PASSWORD
               value: o2ims123
             - name: FLASK_APP
-              value: /root/o2/o2app/entrypoints/flask_application.py
+              value: /src/o2app/entrypoints/flask_application.py
             - name: FLASK_DEBUG
               value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
@@ -137,8 +154,21 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-            - name: configs
-              mountPath: /configs
+            # - name: configs
+            #   mountPath: /configs
+            - name: applicationconfig
+              mountPath: /configs/o2app.conf
+              subPath: config.json
+              readOnly: true
+            - name: servercrt
+              mountPath: /configs/server.crt
+              subPath: config.json
+              readOnly: true
+            - 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:
@@ -152,12 +182,26 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-            - name: configs
-              mountPath: /configs
+        {{- end }}
       volumes:
         - name: scripts
           configMap:
             name: {{ .Chart.Name }}-scripts-configmap
-        - name: configs
-          emptyDir: {}
+        # - name: configs
+        #   emptyDir: {}
+        - configMap:
+            name: {{ .Chart.Name }}-application-config
+          name: applicationconfig
+        - configMap:
+            name: {{ .Chart.Name }}-serverkey
+          name: serverkey
+        - configMap:
+            name: {{ .Chart.Name }}-servercrt
+          name: servercrt
+        - configMap:
+            name: {{ .Chart.Name }}-smocacrt
+          name: smocacrt
+        - name: db-pv
+          persistentVolumeClaim:
+            claimName: {{ .Chart.Name }}-db-pv
 ---