commit 1be88e752d18f9bbc9f23fa5074f6fd80a0882c3
author ecaiyanlinux <martin.c.yan@est.tech> Wed Aug 26 12:24:15 2020 +0200
committer ecaiyanlinux <martin.c.yan@est.tech> Wed Sep 02 15:01:41 2020 +0200
tree ddd3266ca12f97433bb8f814bcd1bf14d4ec6e12
parent f183066766c133065ecfaa0659ca3dfcd2fe1ac1

Mount application.yaml into policymanagementservice helm chart

Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-ID: NONRTRIC-203
Change-Id: Ic739dd7d1ac7eba9a05e51e1c34e33d5a69429bf

nonrtric/helm/policymanagementservice/templates/configmap.yaml

diff --git a/nonrtric/helm/policymanagementservice/templates/configmap.yaml b/nonrtric/helm/policymanagementservice/templates/configmap.yaml
index 0cd9a98..9c91f7d 100644
--- a/nonrtric/helm/policymanagementservice/templates/configmap.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/configmap.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.name.policymanagementservice" . }}-configmap
+  name: {{ include "common.name.policymanagementservice" . }}-configmap-config
   namespace: {{ include "common.namespace.nonrtric" . }}
   labels:
     app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
@@ -26,4 +26,17 @@
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.name.policymanagementservice" . }}-configmap-data
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.policymanagementservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/data/*").AsConfig . | indent 2 }}
\ No newline at end of file

nonrtric/helm/policymanagementservice/templates/deployment.yaml

diff --git a/nonrtric/helm/policymanagementservice/templates/deployment.yaml b/nonrtric/helm/policymanagementservice/templates/deployment.yaml
index 27bd077..68a39a1 100644
--- a/nonrtric/helm/policymanagementservice/templates/deployment.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/deployment.yaml
@@ -61,9 +61,14 @@
           initialDelaySeconds: {{ .Values.policymanagementservice.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.policymanagementservice.liveness.periodSeconds }}
         volumeMounts:
-        - name: {{ include "common.name.policymanagementservice" . }}-policy-conf
+        - name: {{ include "common.name.policymanagementservice" . }}-policy-config
+          mountPath: /opt/app/policy-agent/config
+        - name: {{ include "common.name.policymanagementservice" . }}-policy-data
           mountPath: /opt/app/policy-agent/data
       volumes:
-        - name: {{ include "common.name.policymanagementservice" . }}-policy-conf
+        - name: {{ include "common.name.policymanagementservice" . }}-policy-config
           configMap:
-            name: {{ include "common.name.policymanagementservice" . }}-configmap
\ No newline at end of file
+            name: {{ include "common.name.policymanagementservice" . }}-configmap-config
+        - name: {{ include "common.name.policymanagementservice" . }}-policy-data
+          configMap:
+            name: {{ include "common.name.policymanagementservice" . }}-configmap-data
\ No newline at end of file