From 28d3291692450445484c66807d5eb841443169c9 Mon Sep 17 00:00:00 2001 From: mayankg2703 Date: Tue, 6 Feb 2018 10:24:30 +0000 Subject: config seg aai search data service Change-Id: Ie0229756fabb37a88f46c3d6eb864531660885a8 Issue-ID: OOM-663 Signed-off-by: mayankg2703 --- .../appconfig/analysis-config.json | 32 +++++++++++++++++++++ .../appconfig/auth/search_policy.json | 18 ++++++++++++ .../appconfig/auth/tomcat_keystore | Bin 0 -> 2214 bytes .../appconfig/elastic-search.properties | 5 ++++ .../appconfig/filter-config.json | 7 +++++ .../templates/search-data-service-configmap.yaml | 26 +++++++++++++++++ .../templates/search-data-service-deployment.yaml | 30 +++++++++++++++---- .../appconfig/analysis-config.json | 32 --------------------- .../appconfig/auth/search_policy.json | 18 ------------ .../appconfig/auth/tomcat_keystore | Bin 2214 -> 0 bytes .../appconfig/elastic-search.properties | 5 ---- .../appconfig/filter-config.json | 7 ----- 12 files changed, 113 insertions(+), 67 deletions(-) create mode 100644 kubernetes/aai/resources/config/search-data-service/appconfig/analysis-config.json create mode 100644 kubernetes/aai/resources/config/search-data-service/appconfig/auth/search_policy.json create mode 100644 kubernetes/aai/resources/config/search-data-service/appconfig/auth/tomcat_keystore create mode 100644 kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties create mode 100644 kubernetes/aai/resources/config/search-data-service/appconfig/filter-config.json create mode 100644 kubernetes/aai/templates/search-data-service-configmap.yaml delete mode 100644 kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json delete mode 100644 kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json delete mode 100644 kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore delete mode 100644 kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties delete mode 100644 kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json (limited to 'kubernetes') diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/analysis-config.json b/kubernetes/aai/resources/config/search-data-service/appconfig/analysis-config.json new file mode 100644 index 0000000000..f98ea3799b --- /dev/null +++ b/kubernetes/aai/resources/config/search-data-service/appconfig/analysis-config.json @@ -0,0 +1,32 @@ +[ + { + "name": "whitespace_analyzer", + "description": "A standard whitespace analyzer.", + "behaviours": [ + "Tokenize the text using white space characters as delimeters.", + "Convert all characters to lower case.", + "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents." + ], + "tokenizer": "whitespace", + "filters": [ + "lowercase", + "asciifolding" + ] + }, + { + "name": "ngram_analyzer", + "description": "An analyzer which performs ngram filtering on the data stream.", + "behaviours": [ + "Tokenize the text using white space characters as delimeters.", + "Convert all characters to lower case.", + "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.", + "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2." + ], + "tokenizer": "whitespace", + "filters": [ + "lowercase", + "asciifolding", + "ngram_filter" + ] + } +] \ No newline at end of file diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/auth/search_policy.json b/kubernetes/aai/resources/config/search-data-service/appconfig/auth/search_policy.json new file mode 100644 index 0000000000..72d8902fbe --- /dev/null +++ b/kubernetes/aai/resources/config/search-data-service/appconfig/auth/search_policy.json @@ -0,0 +1,18 @@ +{ + "roles": [ + { + "name": "admin", + "functions": [ + { + "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ] + } + ], + + "users": [ + { + "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" + } + ] + } + ] +} diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/auth/tomcat_keystore b/kubernetes/aai/resources/config/search-data-service/appconfig/auth/tomcat_keystore new file mode 100644 index 0000000000..9eec841aa2 Binary files /dev/null and b/kubernetes/aai/resources/config/search-data-service/appconfig/auth/tomcat_keystore differ diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties new file mode 100644 index 0000000000..006fc6ee02 --- /dev/null +++ b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties @@ -0,0 +1,5 @@ +# ElasticSearch Configuration + +es.cluster-name=ES_AAI +es.ip-address=elasticsearch.onap-aai +es.http-port=9200 diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/filter-config.json b/kubernetes/aai/resources/config/search-data-service/appconfig/filter-config.json new file mode 100644 index 0000000000..e2d5285824 --- /dev/null +++ b/kubernetes/aai/resources/config/search-data-service/appconfig/filter-config.json @@ -0,0 +1,7 @@ +[ + { + "name": "ngram_filter", + "description": "Custom NGram Filter.", + "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]" + } +] \ No newline at end of file diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml new file mode 100644 index 0000000000..c392e412aa --- /dev/null +++ b/kubernetes/aai/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/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml index e1668456ba..392a754459 100644 --- a/kubernetes/aai/templates/search-data-service-deployment.yaml +++ b/kubernetes/aai/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 diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json deleted file mode 100644 index f98ea3799b..0000000000 --- a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "name": "whitespace_analyzer", - "description": "A standard whitespace analyzer.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding" - ] - }, - { - "name": "ngram_analyzer", - "description": "An analyzer which performs ngram filtering on the data stream.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.", - "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding", - "ngram_filter" - ] - } -] \ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json deleted file mode 100644 index 72d8902fbe..0000000000 --- a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "roles": [ - { - "name": "admin", - "functions": [ - { - "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ] - } - ], - - "users": [ - { - "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" - } - ] - } - ] -} diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore deleted file mode 100644 index 9eec841aa2..0000000000 Binary files a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore and /dev/null differ diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties deleted file mode 100644 index 006fc6ee02..0000000000 --- a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties +++ /dev/null @@ -1,5 +0,0 @@ -# ElasticSearch Configuration - -es.cluster-name=ES_AAI -es.ip-address=elasticsearch.onap-aai -es.http-port=9200 diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json deleted file mode 100644 index e2d5285824..0000000000 --- a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "name": "ngram_filter", - "description": "Custom NGram Filter.", - "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]" - } -] \ No newline at end of file -- cgit 1.2.3-korg