diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-09 14:50:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-09 14:50:18 +0000 |
| commit | 437c8f676a2b2785b438e0d461a95be03e5391cd (patch) | |
| tree | ed9a3b2da0059824d9d41b978bdf4223d327b831 | |
| parent | f2131185e18ba27c0ca686914b8b8ae2bd8fe75e (diff) | |
| parent | 934c1153c841d82b178edaae1b2f768fadf0eec0 (diff) | |
Merge "aai model loader config alignment"
| -rw-r--r-- | resources/config/log/model-loader/logback.xml (renamed from resources/model-loader/conf/logback.xml) | 0 | ||||
| -rw-r--r-- | templates/modelloader-deployment-configmap.yaml | 8 | ||||
| -rw-r--r-- | templates/modelloader-deployment.yaml | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/resources/model-loader/conf/logback.xml b/resources/config/log/model-loader/logback.xml index d512d3b..d512d3b 100644 --- a/resources/model-loader/conf/logback.xml +++ b/resources/config/log/model-loader/logback.xml diff --git a/templates/modelloader-deployment-configmap.yaml b/templates/modelloader-deployment-configmap.yaml index 7f37bd6..e5a59a1 100644 --- a/templates/modelloader-deployment-configmap.yaml +++ b/templates/modelloader-deployment-configmap.yaml @@ -15,4 +15,12 @@ metadata: type: Opaque data: {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-model-loader-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/templates/modelloader-deployment.yaml b/templates/modelloader-deployment.yaml index c813058..2508446 100644 --- a/templates/modelloader-deployment.yaml +++ b/templates/modelloader-deployment.yaml @@ -68,16 +68,8 @@ spec: emptyDir: {} - name: aai-model-loader-log-conf configMap: - name: aai-model-loader-configmap + name: aai-model-loader-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-model-loader-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }} #{{ end }} |