Merge "Fixed mount point for policy-apex-pdp config file"

diff --git a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
index 5db1839..c8908c7 100644 (file)
--- a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
@@ -43,7 +43,7 @@
             "carrierTechnologyParameters" : {
               "carrierTechnology" : "RESTSERVER",
               "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters",
+                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
               "parameters" : {
                 "standalone" : true,
                 "host" : "localhost",
@@ -63,7 +63,7 @@
             "carrierTechnologyParameters":{
               "carrierTechnology" : "RESTSERVER",
               "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters"
+                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
             },
             "eventProtocolParameters":{
               "eventProtocol" : "JSON"

diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
index d35b5de..318ad34 100644 (file)
--- a/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
@@ -22,5 +22,5 @@ metadata:
   name: {{ include "common.fullname" . }}-configmap
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/config.json").AsConfig . | indent 2 }}
 

diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
index d7604d3..8063c83 100644 (file)
--- a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
@@ -69,9 +69,8 @@ spec:
             readOnly: true
           - mountPath: /var/log/onap
             name: policy-logs
-          - mountPath: /home/apexuser/config/config.json
+          - mountPath: /home/apexuser/config
             name: apexconfig
-            subpath: config.json
           resources:
 {{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -91,9 +90,6 @@ spec:
         - name: apexconfig
           configMap:
             name: {{ include "common.fullname" . }}-configmap
-            items:
-            - key: config.json
-              path: config.json
-              mode: 0755
+            defaultMode: 0755
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"