X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=charts%2Ftemplates%2Fdeployment.yaml;h=72e35800d3a1e12fb392032faac81eb64d01d294;hb=35a69c4850b6b7eee97c7c9592355c6a70f7be4b;hp=7748f3e1143956f65d127096e176fb55cad670f4;hpb=57c39a0eb78be768f44784eb057c365da4203d60;p=pti%2Fo2.git

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 7748f3e..72e3580 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -1,137 +1,222 @@
-# Copyright (C) 2021 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.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: o2api
-  namespace: {{ .Values.global.namespace }}
-  labels:
-    app: o2api
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: o2api
-  template:
-    metadata:
-      labels:
-        app: o2api
-    spec:
-      imagePullSecrets:
-        - name: {{ .Values.o2ims.imagePullSecrets }}
-{{- if .Values.o2ims.affinity }}
-      affinity:
-{{ toYaml .Values.o2ims.affinity | indent 8 }}
-{{- end }}
-      containers:
-        - name: postgres
-          image: postgres:9.6
-          ports:
-            - containerPort: 5432
-          env:
-            - name: POSTGRES_PASSWORD
-              value: o2ims123
-            - name: POSTGRES_USER
-              value: o2ims
-          command: ["/bin/bash", "/opt/postgres_start.sh"]
-          volumeMounts:
-            - name: scripts
-              mountPath: /opt
-        - name: o2api
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
-          ports:
-            - containerPort: 80
-          env:
-            - name: API_HOST
-              value: api
-            - name: DB_HOST
-              value: postgres
-            - name: DB_PASSWORD
-              value: o2ims123
-            - name: FLASK_APP
-              value: /root/o2/o2ims/entrypoints/flask_application.py
-            - name: FLASK_DEBUG
-              value: {{ .Values.o2ims.logginglevel }}
-            - name: LOGGING_CONFIG_LEVEL
-              value: {{ .Values.o2ims.logginglevel }}
-            - name: OS_AUTH_URL
-            - name: OS_PASSWORD
-            - name: OS_USERNAME
-            - name: PYTHONDONTWRITEBYTECODE
-              value: "1"
-            - name: PYTHONUNBUFFERED
-              value: "1"
-            - name: REDIS_HOST
-              value: redis
-          command: ["/bin/bash", "/opt/o2api_start.sh"]
-          volumeMounts:
-            - name: scripts
-              mountPath: /opt
-        - name: redis
-          image: redis:alpine
-          ports:
-            - containerPort: 6379
-        - name: watcher
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
-          command: ["/bin/bash", "/opt/o2watcher_start.sh"]
-          env:
-            - name: DB_HOST
-              value: postgres
-            - name: DB_PASSWORD
-              value: o2ims123
-            - name: LOGGING_CONFIG_LEVEL
-              value: {{ .Values.o2ims.logginglevel }}
-            - name: OS_AUTH_URL
-              value: {{ .Values.ocloud.OS_AUTH_URL }}
-            - name: OS_PASSWORD
-              value: {{ .Values.ocloud.OS_PASSWORD }}
-            - name: OS_USERNAME
-              value: {{ .Values.ocloud.OS_USERNAME }}
-            - name: PYTHONDONTWRITEBYTECODE
-              value: "1"
-            - name: REDIS_HOST
-              value: redis
-          volumeMounts:
-            - name: scripts
-              mountPath: /opt
-        - name: o2pubsub
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
-          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
-          env:
-            - name: DB_HOST
-              value: postgres
-            - name: DB_PASSWORD
-              value: o2ims123
-            - name: LOGGING_CONFIG_LEVEL
-              value: {{ .Values.o2ims.logginglevel }}
-            - name: OS_AUTH_URL
-              value: {{ .Values.ocloud.OS_AUTH_URL }}
-            - name: OS_PASSWORD
-              value: {{ .Values.ocloud.OS_PASSWORD }}
-            - name: OS_USERNAME
-              value: {{ .Values.ocloud.OS_USERNAME }}
-            - name: PYTHONDONTWRITEBYTECODE
-              value: "1"
-            - name: REDIS_HOST
-              value: redis
-          volumeMounts:
-            - name: scripts
-              mountPath: /opt
-      volumes:
-        - name: scripts
-          configMap:
-            name: {{ .Chart.Name }}-scripts-configmap
----
+# 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.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: o2api
+  namespace: {{ .Values.global.namespace }}
+  labels:
+    app: o2api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: o2api
+  template:
+    metadata:
+      labels:
+        app: o2api
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- range .Values.imagePullSecrets }}
+        - name: {{ . }}
+        {{- end }}
+      {{- end }}
+{{- if .Values.o2ims.affinity }}
+      affinity:
+{{ toYaml .Values.o2ims.affinity | indent 8 }}
+{{- end }}
+      containers:
+        - name: postgres
+          image: "{{ .Values.o2ims.images.tags.postgres }}"
+          ports:
+            - containerPort: 5432
+          env:
+            - name: POSTGRES_PASSWORD
+              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: "{{ .Values.o2ims.images.tags.redis }}"
+          ports:
+            - containerPort: 6379
+        - name: o2pubsub
+          image: "{{ .Values.o2ims.images.tags.o2service }}"
+          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
+          env:
+            - name: DB_HOST
+              value: localhost
+            - name: DB_PASSWORD
+              value: o2ims123
+            - name: LOGGING_CONFIG_LEVEL
+              value: {{ .Values.o2ims.logginglevel }}
+            - name: OS_AUTH_URL
+              value: {{ .Values.ocloud.OS_AUTH_URL }}
+            - name: OS_PASSWORD
+              value: {{ .Values.ocloud.OS_PASSWORD }}
+            - name: OS_USERNAME
+              value: {{ .Values.ocloud.OS_USERNAME }}
+            - name: PYTHONDONTWRITEBYTECODE
+              value: "1"
+            - name: REDIS_HOST
+              value: localhost
+            - name: K8S_KUBECONFIG
+              value: {{ .Values.ocloud.K8S_KUBECONFIG }}
+          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.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: localhost
+            - name: DB_PASSWORD
+              value: o2ims123
+            - name: LOGGING_CONFIG_LEVEL
+              value: {{ .Values.o2ims.logginglevel }}
+            - name: OS_AUTH_URL
+              value: {{ .Values.ocloud.OS_AUTH_URL }}
+            - name: OS_PASSWORD
+              value: {{ .Values.ocloud.OS_PASSWORD }}
+            - name: OS_USERNAME
+              value: {{ .Values.ocloud.OS_USERNAME }}
+            - name: PYTHONDONTWRITEBYTECODE
+              value: "1"
+            - name: REDIS_HOST
+              value: localhost
+          volumeMounts:
+            - name: scripts
+              mountPath: /opt
+            - name: applicationconfig
+              mountPath: /configs/o2app.conf
+              subPath: config.json
+              readOnly: true
+        - name: o2api
+          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: localhost
+            - name: DB_PASSWORD
+              value: o2ims123
+            # - 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
+            - name: OS_PASSWORD
+            - name: OS_USERNAME
+            - name: PYTHONDONTWRITEBYTECODE
+              value: "1"
+            - name: PYTHONUNBUFFERED
+              value: "1"
+            - name: REDIS_HOST
+              value: localhost
+            - name: HELM_USER_PASSWD
+              value: {{ .Values.ocloud.HELM_USER_PASSWD }}
+          command: ["/bin/bash", "/opt/o2api_start.sh"]
+          volumeMounts:
+            - name: scripts
+              mountPath: /opt
+            {{- if .Values.o2dms.helm_cli_enable }}
+            - name: share
+              mountPath: /share
+            {{- end }}
+            - 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.images.tags.o2service }}"
+          ports:
+            - containerPort: 22
+          env:
+            - name: API_HOST_EXTERNAL_FLOATING
+              value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }}
+            - name: HELM_USER_PASSWD
+              value: {{ .Values.ocloud.HELM_USER_PASSWD }}
+          command: ["/bin/bash", "/opt/o2_helmcli_start.sh"]
+          volumeMounts:
+            - name: scripts
+              mountPath: /opt
+            - name: share
+              mountPath: /share
+        {{- end }}
+      volumes:
+        - name: scripts
+          configMap:
+            name: {{ .Chart.Name }}-scripts-configmap
+        {{- if .Values.o2dms.helm_cli_enable }}
+        - name: share
+          emptyDir: {}
+        {{- end }}
+        - 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
+---