aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Venkata Kajur <vk250x@att.com>2020-09-17 15:36:58 -0400
committerHarish Venkata Kajur <vk250x@att.com>2020-09-17 15:42:25 -0400
commit944970742185cccb73110875d1b4ad9f7305337f (patch)
treef8107deaf8b10f1da2ae7be4b38d9c4dd419447c
parent447967d32676845a8f706f1080f2b123af79e11c (diff)
Update to latest guilin docker images
Also update the pods to not use unlimited for the flavor Change also includes traversal, graphadmin, data router to be not using the root user Issue-ID: AAI-3175 Issue-ID: AAI-3180 Change-Id: Ia2237c0ff8025bb2649ef381ae447e6d39961674 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
-rw-r--r--components/aai-babel/values.yaml1
-rw-r--r--components/aai-data-router/values.yaml3
-rw-r--r--components/aai-elasticsearch/values.yaml1
-rw-r--r--components/aai-graphadmin/resources/config/application.properties14
-rw-r--r--components/aai-graphadmin/values.yaml3
-rw-r--r--components/aai-modelloader/values.yaml3
-rw-r--r--components/aai-resources/values.yaml3
-rw-r--r--components/aai-schema-service/values.yaml2
-rw-r--r--components/aai-search-data/values.yaml1
-rw-r--r--components/aai-sparky-be/values.yaml1
-rw-r--r--components/aai-traversal/templates/job.yaml2
-rw-r--r--components/aai-traversal/values.yaml3
-rw-r--r--values.yaml1
13 files changed, 31 insertions, 7 deletions
diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml
index 6396259..24b22b5 100644
--- a/components/aai-babel/values.yaml
+++ b/components/aai-babel/values.yaml
@@ -27,6 +27,7 @@ global:
image: onap/babel:1.7.1
flavor: small
+flavorOverride: small
# application configuration
config:
diff --git a/components/aai-data-router/values.yaml b/components/aai-data-router/values.yaml
index 53f25e7..354559b 100644
--- a/components/aai-data-router/values.yaml
+++ b/components/aai-data-router/values.yaml
@@ -21,10 +21,11 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/data-router:1.6.2
+image: onap/data-router:1.7.0
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
dockerhubRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
diff --git a/components/aai-elasticsearch/values.yaml b/components/aai-elasticsearch/values.yaml
index a07423d..49b4c36 100644
--- a/components/aai-elasticsearch/values.yaml
+++ b/components/aai-elasticsearch/values.yaml
@@ -26,6 +26,7 @@ pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# application configuration
config:
diff --git a/components/aai-graphadmin/resources/config/application.properties b/components/aai-graphadmin/resources/config/application.properties
index 7ff65c9..7cc354a 100644
--- a/components/aai-graphadmin/resources/config/application.properties
+++ b/components/aai-graphadmin/resources/config/application.properties
@@ -26,7 +26,9 @@ info.build.version=1.2.0
spring.application.name=aai-graphadmin
spring.jersey.type=filter
-server.contextPath=/
+spring.main.allow-bean-definition-overriding=true
+server.servlet.context-path=/
+
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
spring.profiles.active={{ .Values.config.profiles.active }}
@@ -97,3 +99,13 @@ schema.service.ssl.key-store=${server.local.startpath}/etc/auth/{{ .Values.globa
schema.service.ssl.trust-store=${server.local.startpath}/etc/auth/{{ .Values.global.config.truststore.filename }}
schema.service.ssl.key-store-password=password({{ .Values.global.config.keystore.passwd }})
schema.service.ssl.trust-store-password=password({{ .Values.global.config.truststore.passwd }})
+
+aperture.rdbmsname=aai_relational
+
+aperture.service.client={{ .Values.global.config.schema.service.client }}
+aperture.service.base.url=http://localhost:8457/aai/aperture
+aperture.service.ssl.key-store=${server.local.startpath}etc/auth/{{ .Values.global.config.keystore.filename }}
+aperture.service.ssl.trust-store=${server.local.startpath}etc/auth/{{ .Values.global.config.truststore.filename }}
+aperture.service.ssl.key-store-password=password({{ .Values.global.config.keystore.passwd }})
+aperture.service.ssl.trust-store-password=password({{ .Values.global.config.truststore.passwd }})
+aperture.service.timeout-in-milliseconds=300000
diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml
index b5519d2..e4f4fac 100644
--- a/components/aai-graphadmin/values.yaml
+++ b/components/aai-graphadmin/values.yaml
@@ -28,10 +28,11 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/aai-graphadmin:1.6.3
+image: onap/aai-graphadmin:1.7.0
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# default number of instances
replicaCount: 1
diff --git a/components/aai-modelloader/values.yaml b/components/aai-modelloader/values.yaml
index f4dc73e..e2b9fa1 100644
--- a/components/aai-modelloader/values.yaml
+++ b/components/aai-modelloader/values.yaml
@@ -21,10 +21,11 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/model-loader:1.6.2
+image: onap/model-loader:1.7.0
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# application configuration
config: {}
diff --git a/components/aai-resources/values.yaml b/components/aai-resources/values.yaml
index fc50f20..4e19ea4 100644
--- a/components/aai-resources/values.yaml
+++ b/components/aai-resources/values.yaml
@@ -22,10 +22,11 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/aai-resources:1.6.6
+image: onap/aai-resources:1.7.2
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# default number of instances
replicaCount: 1
diff --git a/components/aai-schema-service/values.yaml b/components/aai-schema-service/values.yaml
index 2cea373..8fb8191 100644
--- a/components/aai-schema-service/values.yaml
+++ b/components/aai-schema-service/values.yaml
@@ -23,7 +23,7 @@ repository: nexus3.onap.org:10001
image: onap/aai-schema-service:1.7.9
pullPolicy: Always
restartPolicy: Always
-flavor: small
+flavorOverride: small
# default number of instances
replicaCount: 1
diff --git a/components/aai-search-data/values.yaml b/components/aai-search-data/values.yaml
index 53a2064..a8089d6 100644
--- a/components/aai-search-data/values.yaml
+++ b/components/aai-search-data/values.yaml
@@ -25,6 +25,7 @@ image: onap/search-data-service:1.6.2
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# application configuration
config:
elasticsearchHttpPort: 9200
diff --git a/components/aai-sparky-be/values.yaml b/components/aai-sparky-be/values.yaml
index becf402..10448b7 100644
--- a/components/aai-sparky-be/values.yaml
+++ b/components/aai-sparky-be/values.yaml
@@ -34,6 +34,7 @@ image: onap/sparky-be:1.6.2
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
dockerhubRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# application configuration
diff --git a/components/aai-traversal/templates/job.yaml b/components/aai-traversal/templates/job.yaml
index b92830f..4d6b0dd 100644
--- a/components/aai-traversal/templates/job.yaml
+++ b/components/aai-traversal/templates/job.yaml
@@ -76,6 +76,8 @@ spec:
value: {{ .Values.global.config.userId | quote }}
- name: LOCAL_GROUP_ID
value: {{ .Values.global.config.groupId | quote }}
+ resources:
+{{ include "common.resources" . }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
diff --git a/components/aai-traversal/values.yaml b/components/aai-traversal/values.yaml
index 75fd854..e7ffdb9 100644
--- a/components/aai-traversal/values.yaml
+++ b/components/aai-traversal/values.yaml
@@ -23,10 +23,11 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/aai-traversal:1.6.3
+image: onap/aai-traversal:1.7.2
pullPolicy: Always
restartPolicy: Always
flavor: small
+flavorOverride: small
# application configuration
config:
diff --git a/values.yaml b/values.yaml
index 6164331..c0f0999 100644
--- a/values.yaml
+++ b/values.yaml
@@ -301,6 +301,7 @@ image: aaionap/haproxy:1.4.2
pullPolicy: Always
flavor: small
+flavorOverride: small
# flag to enable debugging - application support required
debugEnabled: false