| commit | 4879820e3a534594e2793733c4e705b90d4ea874 | [log] [tgz] |
|---|---|---|
| author | mayankg2703 <mayank.gupta@amdocs.com> | Wed Feb 07 06:02:17 2018 +0000 |
| committer | mayankg2703 <mayank.gupta@amdocs.com> | Thu Feb 08 18:37:04 2018 +0000 |
| tree | 1106416b237fcba930ff414e9304e0efeb0e50ff | |
| parent | 18c2dbcdf7904d6a4030efa141fe232009362800 [diff] |
aai search data config alignment Change-Id: I690bf6863c38265c2ef10f315f0638be65211585 Issue-ID: OOM-671 Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
diff --git a/kubernetes/aai/resources/search-data-service/conf/logback.xml b/kubernetes/aai/resources/config/log/search-data-service/logback.xml similarity index 100% rename from kubernetes/aai/resources/search-data-service/conf/logback.xml rename to kubernetes/aai/resources/config/log/search-data-service/logback.xml
diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml index c392e41..8f707d4 100644 --- a/kubernetes/aai/templates/search-data-service-configmap.yaml +++ b/kubernetes/aai/templates/search-data-service-configmap.yaml
@@ -23,4 +23,12 @@ namespace: {{ .Values.nsPrefix }}-aai data: {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-search-data-service-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }} #{{ end }}
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml index 392a754..5f66710 100644 --- a/kubernetes/aai/templates/search-data-service-deployment.yaml +++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -89,16 +89,8 @@ emptyDir: {} - name: aai-search-data-service-log-conf configMap: - name: aai-search-data-service-configmap + name: aai-search-data-service-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-search-data-service-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }} #{{ end }}