X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=charts%2Ftemplates%2Fdeployment.yaml;h=72e35800d3a1e12fb392032faac81eb64d01d294;hb=34244dc4e31185ce2bb20c2a611b75edee39b2c1;hp=bcc8dc95dca1f1a10be64280f243c91321417ae3;hpb=4f9eafd85b51688708f6bf24e9334c532a331d8f;p=pti%2Fo2.git

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index bcc8dc9..72e3580 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Wind River Systems, Inc.
+# Copyright (C) 2021-2023 Wind River Systems, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -29,19 +29,28 @@ spec:
     metadata:
       labels:
         app: o2api
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
-      # imagePullSecrets:
-      #   - name: {{ .Values.o2ims.imagePullSecrets }}
+      {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ .Values.o2ims.serviceaccountname }}-registry-secret
+        {{- range .Values.imagePullSecrets }}
+        - name: {{ . }}
+        {{- end }}
+      {{- end }}
 {{- if .Values.o2ims.affinity }}
       affinity:
 {{ toYaml .Values.o2ims.affinity | indent 8 }}
 {{- end }}
       containers:
         - name: postgres
-          image: postgres:9.6
+          image: "{{ .Values.o2ims.images.tags.postgres }}"
           ports:
             - containerPort: 5432
           env:
@@ -49,20 +58,24 @@ 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
+          image: "{{ .Values.o2ims.images.tags.redis }}"
           ports:
             - containerPort: 6379
         - name: o2pubsub
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
           env:
             - name: DB_HOST
-              value: postgres
+              value: localhost
             - name: DB_PASSWORD
               value: o2ims123
             - name: LOGGING_CONFIG_LEVEL
@@ -76,7 +89,7 @@ spec:
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
             - name: REDIS_HOST
-              value: redis
+              value: localhost
             - name: K8S_KUBECONFIG
               value: {{ .Values.ocloud.K8S_KUBECONFIG }}
           volumeMounts:
@@ -86,14 +99,17 @@ spec:
               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 }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           command: ["/bin/bash", "/opt/o2watcher_start.sh"]
           env:
             - name: API_HOST_EXTERNAL_FLOATING
               value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }}
             - name: DB_HOST
-              value: postgres
+              value: localhost
             - name: DB_PASSWORD
               value: o2ims123
             - name: LOGGING_CONFIG_LEVEL
@@ -107,7 +123,7 @@ spec:
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
             - name: REDIS_HOST
-              value: redis
+              value: localhost
           volumeMounts:
             - name: scripts
               mountPath: /opt
@@ -116,20 +132,20 @@ spec:
               subPath: config.json
               readOnly: true
         - name: o2api
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           ports:
             - containerPort: 80
           env:
             - name: API_HOST_EXTERNAL_FLOATING
               value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }}
             - name: DB_HOST
-              value: postgres
+              value: localhost
             - name: DB_PASSWORD
               value: o2ims123
-            - name: FLASK_APP
-              value: /src/o2app/entrypoints/flask_application.py
-            - name: FLASK_DEBUG
-              value: {{ .Values.o2ims.logginglevel }}
+            # - name: FLASK_APP
+            #   value: /src/o2app/entrypoints/flask_application.py
+            # - name: FLASK_DEBUG
+            #   value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
               value: {{ .Values.o2ims.logginglevel }}
             - name: OS_AUTH_URL
@@ -140,15 +156,17 @@ spec:
             - name: PYTHONUNBUFFERED
               value: "1"
             - name: REDIS_HOST
-              value: redis
+              value: localhost
             - name: HELM_USER_PASSWD
               value: {{ .Values.ocloud.HELM_USER_PASSWD }}
           command: ["/bin/bash", "/opt/o2api_start.sh"]
           volumeMounts:
             - name: scripts
               mountPath: /opt
-            # - name: configs
-            #   mountPath: /configs
+            {{- if .Values.o2dms.helm_cli_enable }}
+            - name: share
+              mountPath: /share
+            {{- end }}
             - name: applicationconfig
               mountPath: /configs/o2app.conf
               subPath: config.json
@@ -161,12 +179,9 @@ spec:
               mountPath: /configs/server.key
               subPath: config.json
               readOnly: true
-            - name: smocacrt
-              mountPath: /configs/smoca.crt
-              subPath: config.json
-              readOnly: true
+        {{- if .Values.o2dms.helm_cli_enable }}
         - name: helmcli
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
           ports:
             - containerPort: 22
           env:
@@ -178,12 +193,17 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
+            - name: share
+              mountPath: /share
+        {{- end }}
       volumes:
         - name: scripts
           configMap:
             name: {{ .Chart.Name }}-scripts-configmap
-        # - name: configs
-        #   emptyDir: {}
+        {{- if .Values.o2dms.helm_cli_enable }}
+        - name: share
+          emptyDir: {}
+        {{- end }}
         - configMap:
             name: {{ .Chart.Name }}-application-config
           name: applicationconfig
@@ -196,4 +216,7 @@ spec:
         - configMap:
             name: {{ .Chart.Name }}-smocacrt
           name: smocacrt
+        - name: db-pv
+          persistentVolumeClaim:
+            claimName: {{ .Chart.Name }}-db-pv
 ---