From 84375f1cd37315c59fedd594af5d22bcfb3d1f82 Mon Sep 17 00:00:00 2001 From: mayankg2703 Date: Tue, 6 Feb 2018 16:40:19 +0000 Subject: config seg aai sparky be Change-Id: Ic322d59fe4d79e35595a72daf7842ee03954023b Issue-ID: OOM-664 Signed-off-by: mayankg2703 --- templates/sparky-be-deployment-configmap.yaml | 34 ++++++++++++++++++++++ templates/sparky-be-deployment.yaml | 42 +++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 templates/sparky-be-deployment-configmap.yaml (limited to 'templates') diff --git a/templates/sparky-be-deployment-configmap.yaml b/templates/sparky-be-deployment-configmap.yaml new file mode 100644 index 0000000..55dea65 --- /dev/null +++ b/templates/sparky-be-deployment-configmap.yaml @@ -0,0 +1,34 @@ +#{{ if not .Values.disableAaiSparkyBe }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: sparky-be-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: sparky-be-model-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/model/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: sparky-be-portal-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/portal/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: sparky-be-secret + namespace: {{ .Values.nsPrefix }}-aai +type: Opaque +data: +{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }} +#{{ end }} diff --git a/templates/sparky-be-deployment.yaml b/templates/sparky-be-deployment.yaml index 484a87f..dfeab6a 100644 --- a/templates/sparky-be-deployment.yaml +++ b/templates/sparky-be-deployment.yaml @@ -29,8 +29,30 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/app/sparky/config/ + - mountPath: /opt/app/sparky/config/auth/ + name: aai-sparky-be-auth-config + - mountPath: /opt/app/sparky/config/synchronizer.properties + subPath: synchronizer.properties name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/suggestive-search.properties + subPath: suggestive-search.properties + name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/search-service.properties + subPath: search-service.properties + name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/roles.config + subPath: roles.config + name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/elasticsearch.properties + subPath: elasticsearch.properties + name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/aai.properties + subPath: aai.properties + name: aai-sparky-be-config + - mountPath: /opt/app/sparky/config/model/ + name: aai-sparky-be-model-config + - mountPath: /opt/app/sparky/config/portal/ + name: aai-sparky-be-portal-config - mountPath: /var/log/onap name: aai-sparky-be-logs - mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml @@ -48,6 +70,7 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml name: filebeat-conf - mountPath: /var/log/onap name: aai-sparky-be-logs @@ -58,11 +81,20 @@ spec: hostPath: path: /etc/localtime - name: aai-sparky-be-config - hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/" + configMap: + name: sparky-be-configmap + - name: aai-sparky-be-model-config + configMap: + name: sparky-be-model-configmap + - name: aai-sparky-be-portal-config + configMap: + name: sparky-be-portal-configmap + - name: aai-sparky-be-auth-config + secret: + secretName: sparky-be-secret - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + configMap: + name: aai-filebeat-configmap - name: aai-sparky-be-logs emptyDir: {} - name: aai-sparky-filebeat -- cgit 1.2.3-korg