Update helm chart to refer built app file

[pti/o2.git] / charts / templates / deployment.yaml

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 0f0b433..a9ea8fd 100644 (file)
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -30,8 +30,9 @@ spec:
       labels:
         app: o2api
     spec:
-      imagePullSecrets:
-        - name: {{ .Values.o2ims.imagePullSecrets }}
+      serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
+      # imagePullSecrets:
+      #   - name: {{ .Values.o2ims.imagePullSecrets }}
 {{- if .Values.o2ims.affinity }}
       affinity:
 {{ toYaml .Values.o2ims.affinity | indent 8 }}
@@ -116,7 +117,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
@@ -130,12 +131,33 @@ spec:
               value: "1"
             - name: REDIS_HOST
               value: redis
+            - 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
+        - name: helmcli
+          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          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: configs
+              mountPath: /configs
       volumes:
         - name: scripts
           configMap:
             name: {{ .Chart.Name }}-scripts-configmap
+        - name: configs
+          emptyDir: {}
 ---