[UUI] Deploy 15.0.1 intent-analysis image

- this adds tracing for the service
- leverage startup probe to avoid initialDelaySeconds of 120 seconds

Issue-ID: USECASEUI-889
Change-Id: Ia71c1dfd2f3c4760cf2a5beb1daafb7ebfada736
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 9076b17..6b70dc5 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -119,6 +119,14 @@ global:
   # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
   clusterName: cluster.local
 
+  # enable this if you have deployed Jaeger alongside ONAP
+  tracing:
+    enabled: false
+    collector:
+      baseUrl: http://jaeger-collector.istio-config:9411
+    sampling:
+      probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
+
   # default mount path root directory referenced
   # by persistent volumes and log files
   persistence:

diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml
index 890bc5e..2d52f1e 100644 (file)
--- a/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/templates/deployment.yaml
@@ -43,25 +43,37 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 10 }}
         - name: POSTGRES_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 10 }}
-{{- if eq .Values.liveness.enabled true }}
+        - name: TRACING_ENABLED
+          value: {{ .Values.global.tracing.enabled | quote }}
+        - name: COLLECTOR_HOST
+          value: {{ .Values.tracing.collector.host }}
+        - name: COLLECTOR_PORT
+          value: {{ .Values.tracing.collector.port | quote }}
+        {{- if eq .Values.startup.enabled true }}
+        startupProbe:
+          httpGet:
+            port: {{ .Values.startup.port }}
+            path: {{ .Values.startup.path }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
+        {{- end }}
+        {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
             port: {{ .Values.liveness.port }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
-{{- end }}
+        {{- end }}
         readinessProbe:
           tcpSocket:
             port: {{ .Values.readiness.port }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
-{{- if .Values.nodeSelector }}
+        {{- if .Values.nodeSelector }}
         nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
-{{- end }}
-{{- if .Values.affinity }}
+        {{- end }}
+        {{- if .Values.affinity }}
         affinity: {{ toYaml .Values.affinity | nindent 10 }}
-{{- end }}
+        {{- end }}
         volumeMounts:
         - mountPath: /uui/run.sh
           name: entrypoint

diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index 53c1aa0..65f7214 100644 (file)
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -18,6 +18,8 @@
 
 global:
   passwordStrength: long
+  tracing:
+    enabled: false
 
 #Pods Service Account
 serviceAccount:
@@ -40,7 +42,7 @@ secrets:
     password: '{{ .Values.postgres.config.pgUserPassword }}'
     passwordPolicy: generate
 
-image: onap/usecase-ui-intent-analysis:15.0.0
+image: onap/usecase-ui-intent-analysis:15.0.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -58,14 +60,19 @@ service:
   - name: http-rest
     port: &svc_port 8083
 
+startup:
+  enabled: true
+  path: /api/usecaseui-intent-analysis/v1/actuator/health
+  port: *svc_port
+  periodSeconds: 1
+  failureThreshold: 90
+
 liveness:
-  initialDelaySeconds: 120
+  enabled: true
   port: *svc_port
   periodSeconds: 10
-  enabled: true
 
 readiness:
-  initialDelaySeconds: 60
   port: *svc_port
   periodSeconds: 10
 
@@ -125,6 +132,11 @@ resources:
       memory: "1Gi"
   unlimited: {}
 
+tracing:
+  collector:
+    host: jaeger-collector.istio-config
+    port: 9411
+
 # Annotations to control the execution and deletion of the job
 # Can be used to delete a job before an Upgrade
 #

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 4ea0030..83dabb3 100644 (file)
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -201,7 +201,7 @@ uuiServer:
     so:
       baseUrl: http://so.onap:8080
       username: InfraPortalClient
-      password: password1
+      password: password1$
     sdc:
       baseUrl: http://sdc-be:8080
       username: aai