diff options
| author |   mayankg2703 <mayank.gupta@amdocs.com> | 2018-02-06 10:24:30 +0000 |
|---|---|---|
| committer | mayankg2703 <mayank.gupta@amdocs.com> | 2018-02-06 10:25:03 +0000 |
| commit | 2a6b3962c617ac2f7dbcb29105955b5f8b2c6060 (patch) | |
| tree | 867d6b1aaf0bd268e7d19156423c68d4abcd8fa1 /templates | |
| parent | 34fb0cf4e6625ad918710f982399c7e8cf10242b (diff) | |
config seg aai search data service
Change-Id: Ie0229756fabb37a88f46c3d6eb864531660885a8
Issue-ID: OOM-663
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/search-data-service-configmap.yaml | 26 | ||||
| -rw-r--r-- | templates/search-data-service-deployment.yaml | 30 |
2 files changed, 51 insertions, 5 deletions
diff --git a/templates/search-data-service-configmap.yaml b/templates/search-data-service-configmap.yaml new file mode 100644 index 0000000..c392e41 --- /dev/null +++ b/templates/search-data-service-configmap.yaml @@ -0,0 +1,26 @@ +#{{ if not .Values.disableAaiSearchDataService }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: search-data-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: search-data-keystone-secret + namespace: {{ .Values.nsPrefix }}-aai +type: Opaque +data: +{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/tomcat_keystore").AsSecrets . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-search-policy-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }} +#{{ end }} diff --git a/templates/search-data-service-deployment.yaml b/templates/search-data-service-deployment.yaml index e166845..392a754 100644 --- a/templates/search-data-service-deployment.yaml +++ b/templates/search-data-service-deployment.yaml @@ -29,8 +29,21 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/app/search-data-service/config/ + - mountPath: /opt/app/search-data-service/config/filter-config.json + subPath: filter-config.json name: aai-search-data-service-config + - mountPath: /opt/app/search-data-service/config/elastic-search.properties + subPath: elastic-search.properties + name: aai-search-data-service-config + - mountPath: /opt/app/search-data-service/config/analysis-config.json + subPath: filter-config.json + name: aai-search-data-service-config + - mountPath: /opt/app/search-data-service/config/auth/tomcat_keystore + subPath: tomcat_keystore + name: aai-search-data-service-auth-config + - mountPath: /opt/app/search-data-service/config/auth/search_policy.json + subPath: search_policy.json + name: aai-search-data-search-policy-config - mountPath: /var/log/onap name: aai-search-data-service-logs - mountPath: /opt/app/search-data-service/bundleconfig/etc/logback.xml @@ -48,6 +61,7 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml name: filebeat-conf - mountPath: /var/log/onap name: aai-search-data-service-logs @@ -58,11 +72,17 @@ spec: hostPath: path: /etc/localtime - name: aai-search-data-service-config - hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/" + configMap: + name: search-data-configmap + - name: aai-search-data-service-auth-config + secret: + secretName: search-data-keystone-secret + - name: aai-search-data-search-policy-config + configMap: + name: aai-search-policy-configmap - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + configMap: + name: aai-filebeat-configmap - name: aai-search-data-service-logs emptyDir: {} - name: aai-search-data-service-filebeat |