summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml4
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml1
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml2
-rw-r--r--kubernetes/aai/charts/aai-resources/resources/config/application.properties2
-rw-r--r--kubernetes/aai/charts/aai-search-data/values.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml8
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml19
7 files changed, 29 insertions, 9 deletions
diff --git a/kubernetes/aai/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml b/kubernetes/aai/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
index e995053f12..5db9092951 100644
--- a/kubernetes/aai/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
+++ b/kubernetes/aai/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
@@ -5,8 +5,8 @@
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" >
- <property name="sourceDomain" value="default" />
- <property name="searchBaseUrl" value="https://search-data-service:9509" />
+ <property name="sourceDomain" value="dev" />
+ <property name="searchBaseUrl" value="https://{{.Values.global.searchData.serviceName}}.{{.Release.Namespace}}:9509" />
<property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
<property name="searchEndpointDocuments" value = "documents" />
<property name="searchEntitySearchIndex" value="entity-search-index" />
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
index 0417536625..40c621068c 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
@@ -17,6 +17,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
initContainers:
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml
index 54ee8b670d..f3a6dbbc5e 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml
@@ -20,6 +20,6 @@ spec:
name: {{ .Values.service.portName }}
{{- end}}
selector:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
release: {{ .Release.Name }}
clusterIP: None
diff --git a/kubernetes/aai/charts/aai-resources/resources/config/application.properties b/kubernetes/aai/charts/aai-resources/resources/config/application.properties
index a65c04e4f0..cfeabb9e0d 100644
--- a/kubernetes/aai/charts/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/charts/aai-resources/resources/config/application.properties
@@ -44,7 +44,7 @@ server.ssl.key-store-type=JKS
# JMS bind address host port
jms.bind.address=tcp://localhost:61647
dmaap.ribbon.eureka.enabled=false
-dmaap.ribbon.listOfServers=dmaap.{{ include "common.namespace" . }}:3904
+dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3904
# Number of milliseconds to wait before making ping requests again
dmaap.ribbon.ServerListRefreshInterval=75000
dmaap.ribbon.NFLoadBalancerPingInterval=75000
diff --git a/kubernetes/aai/charts/aai-search-data/values.yaml b/kubernetes/aai/charts/aai-search-data/values.yaml
index f781662e79..2c3a005db9 100644
--- a/kubernetes/aai/charts/aai-search-data/values.yaml
+++ b/kubernetes/aai/charts/aai-search-data/values.yaml
@@ -9,7 +9,7 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/search-data-service:1.2.1
+image: onap/search-data-service:1.2.2
pullPolicy: Always
restartPolicy: Always
diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
index 0763f94cd1..29eb4a311a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
@@ -142,7 +142,7 @@
<map>
<entry key="aggregate_generic-vnf_index">
<bean class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="aggregate_generic-vnf_index" />
+ <property name="indexName" value="aggregate-vnf-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
</bean>
@@ -212,7 +212,7 @@
</bean>
<bean id="autoSuggestionEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entityautosuggestindex" />
+ <property name="indexName" value="entity-autosuggest-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" />
<property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" />
@@ -296,7 +296,7 @@
</bean>
<bean id="geoEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="topographicalsearchindex" />
+ <property name="indexName" value="topography-search-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
</bean>
@@ -336,7 +336,7 @@
</bean>
<bean id="viewInspectySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entitysearchindex" />
+ <property name="indexName" value="entity-search-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index b459646a6b..b9de92bb28 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -34,6 +34,25 @@ spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aai-elasticsearch
+ - --container-name
+ - aai-search-data
+ - --container-name
+ - aai
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"