diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-09 14:50:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-09 14:50:10 +0000 |
| commit | 7514da298acfbaaa33115d2d1fff0929bbac876a (patch) | |
| tree | a3dc271719eb0c2b7ef395ab86868f63be37338f | |
| parent | ce7844b207021251ec76a5aa5d7b8c1de3555a12 (diff) | |
| parent | 38d6d7b99c5fb2f137ba4b22a23f2291fcc554d7 (diff) | |
Merge "aai sparky be config alignment"
| -rw-r--r-- | kubernetes/aai/resources/config/log/sparky-be/logback.xml (renamed from kubernetes/aai/resources/sparky-be/conf/logback.xml) | 0 | ||||
| -rw-r--r-- | kubernetes/aai/templates/sparky-be-deployment-configmap.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/aai/templates/sparky-be-deployment.yaml | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/aai/resources/sparky-be/conf/logback.xml b/kubernetes/aai/resources/config/log/sparky-be/logback.xml index c1b99c183f..c1b99c183f 100644 --- a/kubernetes/aai/resources/sparky-be/conf/logback.xml +++ b/kubernetes/aai/resources/config/log/sparky-be/logback.xml diff --git a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml index 55dea653cd..590608b566 100644 --- a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml @@ -31,4 +31,12 @@ metadata: type: Opaque data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-sparky-be-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/sparky-be/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml index dfeab6a394..9fe324a817 100644 --- a/kubernetes/aai/templates/sparky-be-deployment.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment.yaml @@ -101,16 +101,8 @@ spec: emptyDir: {} - name: aai-sparky-be-log-conf configMap: - name: aai-sparky-be-configmap + name: aai-sparky-be-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-sparky-be-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }} #{{ end }} |