From 33e3cc0ad06c0253aab8a0f285b9eadc1149fed2 Mon Sep 17 00:00:00 2001 From: mayankg2703 Date: Wed, 7 Feb 2018 05:56:34 +0000 Subject: [PATCH] aai model loader config alignment Change-Id: Ifc5db843fb45c458c2d2a9294c52201fc27f425e Issue-ID: OOM-669 Signed-off-by: mayankg2703 --- .../{model-loader/conf => config/log/model-loader}/logback.xml | 0 kubernetes/aai/templates/modelloader-deployment-configmap.yaml | 8 ++++++++ kubernetes/aai/templates/modelloader-deployment.yaml | 10 +--------- 3 files changed, 9 insertions(+), 9 deletions(-) rename kubernetes/aai/resources/{model-loader/conf => config/log/model-loader}/logback.xml (100%) diff --git a/kubernetes/aai/resources/model-loader/conf/logback.xml b/kubernetes/aai/resources/config/log/model-loader/logback.xml similarity index 100% rename from kubernetes/aai/resources/model-loader/conf/logback.xml rename to kubernetes/aai/resources/config/log/model-loader/logback.xml diff --git a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml index 7f37bd605b..e5a59a124d 100644 --- a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml +++ b/kubernetes/aai/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/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index c81305817c..2508446334 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/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 }} -- 2.16.6