aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-09-19 17:07:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-19 17:07:31 +0000
commit5893da8ddf5bb76265366ec6e7007084055d786b (patch)
tree822673bf443a1fe27e9162bf125d2b97957704f6
parentb1bfc0b96c65484ad61efb57ca89e1dd17b246f6 (diff)
parent0d92fb7ed1b3b7f11d5bba72cff571b52facf251 (diff)
Merge "Fixed mount point for policy-apex-pdp config file"
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json4
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml2
-rw-r--r--kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml8
3 files changed, 5 insertions, 9 deletions
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 5db1839ac9..c8908c7b91 100644
--- 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 d35b5de4c2..318ad34491 100644
--- 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 d7604d3231..8063c83817 100644
--- 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"