From: ecaiyanlinux <martin.c.yan@est.tech>
Date: Wed, 26 Aug 2020 10:24:15 +0000 (+0200)
Subject: Mount application.yaml into policymanagementservice helm chart
X-Git-Tag: f-release~80
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=commitdiff_plain;h=1be88e752d18f9bbc9f23fa5074f6fd80a0882c3

Mount application.yaml into policymanagementservice helm chart

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

diff --git a/nonrtric/helm/policymanagementservice/resources/config/application.yaml b/nonrtric/helm/policymanagementservice/resources/config/application.yaml
new file mode 100644
index 00000000..e9146e01
--- /dev/null
+++ b/nonrtric/helm/policymanagementservice/resources/config/application.yaml
@@ -0,0 +1,37 @@
+spring:
+  profiles:
+    active: prod
+  main:
+    allow-bean-definition-overriding: true
+  aop:
+    auto: false
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+
+logging:
+  level:
+    ROOT: ERROR
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+    org.oransc.policyagent: INFO
+  file: /var/log/policy-agent/application.log
+server:
+   port : 8433
+   http-port: 8081
+   ssl:
+      key-store-type: JKS
+      key-store-password: policy_agent
+      key-store: /opt/app/policy-agent/etc/cert/keystore.jks
+      key-password: policy_agent
+      key-alias: policy_agent
+app:
+  filepath: /opt/app/policy-agent/data/application_configuration.json
+  webclient:
+    trust-store-used: false
+    trust-store-password: policy_agent
+    trust-store: /opt/app/policy-agent/etc/cert/truststore.jks
+
diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
similarity index 100%
rename from nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
rename to nonrtric/helm/policymanagementservice/resources/data/application_configuration.json
diff --git a/nonrtric/helm/policymanagementservice/templates/configmap.yaml b/nonrtric/helm/policymanagementservice/templates/configmap.yaml
index 0cd9a988..9c91f7d0 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 @@ metadata:
     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
diff --git a/nonrtric/helm/policymanagementservice/templates/deployment.yaml b/nonrtric/helm/policymanagementservice/templates/deployment.yaml
index 27bd0773..68a39a12 100644
--- a/nonrtric/helm/policymanagementservice/templates/deployment.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/deployment.yaml
@@ -61,9 +61,14 @@ spec:
           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
diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index 5986c148..3cffe1a0 100644
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -42,7 +42,7 @@ policymanagementservice:
     periodSeconds: 10
   controllers: |
     [
-         {  
+         {
             "name": "controller1",
             "baseUrl": "https://a1controller:8383",
             "userName": "admin",