[AAI] sparky-be 16.0.0 release

- update image (2.0.5 -> 2.0.7)
- introduce startup probe to startup as fast as possible
- add /tmp volume to prepare spring-boot 2 upgrade

Issue-ID: AAI-4161
Change-Id: I270d95e15dfe9be0c794d3b890bba4b6ab3f89e0
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 1433ecf..ceb0b94 100644 (file)
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -58,7 +58,7 @@ dependencies:
     repository: 'file://components/aai-schema-service'
     condition: aai-schema-service.enabled
   - name: aai-sparky-be
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/aai-sparky-be'
     condition: aai-sparky-be.enabled
   - name: aai-traversal

diff --git a/kubernetes/aai/components/aai-sparky-be/Chart.yaml b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
index 074e266..b63a2dc 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: ONAP AAI sparky-be
 name: aai-sparky-be
-version: 15.0.1
+version: 16.0.0
 
 dependencies:
   - name: common
@@ -31,4 +31,4 @@ dependencies:
     repository: '@local'
   - name: readinessCheck
     version: ~13.x-0
-    repository: '@local'
\ No newline at end of file
+    repository: '@local'

diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 7248bb3..517601b 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -46,13 +46,6 @@ spec:
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         {{ include "common.containerSecurityContext" . | indent 8 | trim }}
-        command:
-        - sh
-        args:
-        - -c
-        - |
-          echo "*** actual launch of AAI Sparky BE"
-          /opt/app/sparky/bin/start.sh
         volumeMounts:
         - mountPath: {{ .Values.log.path }}
           name: logs
@@ -83,6 +76,8 @@ spec:
         - mountPath:  /opt/app/sparky/config/logging/logback.xml
           name: config
           subPath: logback.xml
+        - mountPath: /tmp
+          name: tmp-volume
         ports:
           {{- if .Values.debug.enabled }}
           - containerPort: {{ .Values.debug.port }}
@@ -101,7 +96,7 @@ spec:
         {{- end }}
         {{- end }}
         {{- if .Values.profiling.enabled }}
-        - name: JVM_ARGS
+        - name: PRE_JVM_ARGS
           value: '{{ join " " .Values.profiling.args }}'
         {{- end }}
         {{- if .Values.debug.enabled }}
@@ -122,6 +117,11 @@ spec:
             port: {{ .Values.service.internalPort }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+        startupProbe:
+          tcpSocket:
+            port: {{ .Values.service.internalPort }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
@@ -146,5 +146,8 @@ spec:
       - name: modeldir
         emptyDir:
           sizeLimit: {{ .Values.volumes.modeldirSizeLimit }}
+      - name: tmp-volume
+        emptyDir:
+          sizeLimit: {{ .Values.volumes.tmpSizeLimit }}
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       {{- include "common.imagePullSecrets" . | nindent 6 }}

diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml
index 9cbe9e5..d386f21 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@ -29,12 +29,12 @@ global: # global defaults
     serviceName: aai-search-data
 
 # application image
-image: onap/sparky-be:2.0.5
+image: onap/sparky-be:2.0.7
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
 dockerhubRepository: registry.hub.docker.com
-ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+
 # application configuration
 config:
   elasticsearchHttpPort: 9200
@@ -79,7 +79,7 @@ profiling:
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 updateStrategy:
   type: RollingUpdate
@@ -102,6 +102,10 @@ readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
 
+startup:
+  failureThreshold: 90
+  periodSeconds: 1
+
 service:
   type: NodePort
   internalPort: 9517
@@ -136,14 +140,14 @@ resources:
   small:
     limits:
       cpu: "500m"
-      memory: "4Gi"
+      memory: "2Gi"
     requests:
       cpu: "250m"
       memory: "1Gi"
   large:
     limits:
       cpu: "1"
-      memory: "8Gi"
+      memory: "4Gi"
     requests:
       cpu: "500m"
       memory: "2Gi"
@@ -163,6 +167,7 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 volumes:
   logSizeLimit: 64Mi
   modeldirSizeLimit: 64Mi
+  tmpSizeLimit: 64Mi
 
 securityContext:
   user_id: 1000