[UUI] Update image version 16.0.1 of components of UUI

[oom.git] / kubernetes / uui / components / uui-server / templates / deployment.yaml

diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml
index 3823a70..0d48648 100644 (file)
--- a/kubernetes/uui/components/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml
@@ -21,6 +21,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
   selector: {{- include "common.selectors" . | nindent 4 }}
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
@@ -51,8 +52,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - "{{ .Values.postgres.nameOverride }}"
+        - --service-name
+        - "{{ .Values.postgres.service.name2 }}"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -62,6 +63,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "500Mi"
+          requests:
+            cpu: "3m"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
@@ -75,24 +83,35 @@ spec:
           ports: {{ include "common.containerPorts" . | nindent 10  }}
           # disable liveness probe when breakpoints set in debugger
           # so K8s doesn't restart unresponsive container
+          {{- if eq .Values.startup.enabled true }}
+          startupProbe:
+            httpGet:
+              port: {{ index .Values.service.ports 0 "port" }}
+              path: {{ .Values.uuiServer.basePath }}{{ .Values.startup.path }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
+            periodSeconds: {{ .Values.startup.periodSeconds }}
+          {{- end }}
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
-            tcpSocket:
-              port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+            httpGet:
+              port: {{ index .Values.service.ports 0 "port" }}
+              path: {{ .Values.uuiServer.basePath }}{{ .Values.liveness.path }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            failureThreshold: {{ .Values.liveness.failureThreshold }}
           {{- end }}
-          resources: {{ include "common.resources" . | nindent 12 }}
           readinessProbe:
-            tcpSocket:
-              port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+            httpGet:
+              port: {{ index .Values.service.ports 0 "port" }}
+              path: {{ .Values.uuiServer.basePath }}{{ .Values.readiness.path }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+          resources: {{ include "common.resources" . | nindent 12 }}
           env:
           - name: MSB_ADDR
             value: {{tpl .Values.msbaddr .}}
           - name: MR_ADDR
             value: {{tpl .Values.mraddr .}}
+          - name: AAI_ADDR
+            value: {{tpl .Values.aaiaddr .}}
           - name: POSTGRES_IP
             value: {{.Values.postgres.service.name2}}
           - name: POSTGRES_PORT
@@ -119,5 +138,4 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-entrypoint
           defaultMode: 0755
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}