Merge "Add helm chart for ca and config files."

diff --combined charts/templates/deployment.yaml
index 82b675d,d229f44..d9ebf10
--- 1/charts/templates/deployment.yaml
--- 2/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@@ -31,10 -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 }}
@@@ -119,7 -117,7 +119,7 @@@
              - 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
@@@ -141,6 -139,18 +141,18 @@@
                mountPath: /opt
              - name: configs
                mountPath: /configs
+             - name: applicationconfig
+               mountPath: /configs/o2app.conf
+               subPath: config.json
+               readOnly: true
+             - name: caconfig
+               mountPath: /configs/ca.cert
+               subPath: config.json
+               readOnly: true
+             - name: serverkeyconfig
+               mountPath: /configs/server.key
+               subPath: config.json
+               readOnly: true
          - name: helmcli
            image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
            ports:
@@@ -154,12 -164,20 +166,20 @@@
            volumeMounts:
              - name: scripts
                mountPath: /opt
-             - name: configs
-               mountPath: /configs
        volumes:
          - name: scripts
            configMap:
              name: {{ .Chart.Name }}-scripts-configmap
          - name: configs
            emptyDir: {}
+         - configMap:
+             name: {{ .Chart.Name }}-application-config
+           name: applicationconfig
+         - configMap:
+             name: {{ .Chart.Name }}-serverkeyconfig
+           name: serverkeyconfig
+         - configMap:
+             name: {{ .Chart.Name }}-caconfig
+           name: caconfig
  ---
+ 

diff --combined charts/values.yaml
index d1e5b3f,bb31c34..9070606
--- 1/charts/values.yaml
--- 2/charts/values.yaml
+++ b/charts/values.yaml
@@@ -22,6 -22,12 +22,12 @@@ replicaCount: 
  nameOverride: ""
  fullnameOverride: ""
  
+ applicationconfig:
+ 
+ caconfig:
+ 
+ serverkeyconfig:
+ 
  resources:
    cpu: 1
    memory: 2Gi
@@@ -30,7 -36,7 +36,7 @@@ global
    namespace: orano2
  
  o2ims:
 -  serviceaccountname: admin
 +  serviceaccountname: admin-orano2
    image:
      repository: registry.local:9001/admin/o2imsdms
      tag: 0.1.1