Reduce cpu requests

- reduce cpu requests by 17.9 cores in the small flavor
- [aai,uui,cds,cps,so,policy] add startup probes to account for slower container
  startup

Issue-ID: OOM-3381
Change-Id: I8650e8abcdcbeac8ddff9586da7ace11603649af
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index b2d24e9..9db50f6 100644 (file)
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -109,7 +109,7 @@ resources:
       cpu: "2"
       memory: "600Mi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "300Mi"
   large:
     limits:

diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
index 57f770b..8d805ee 100644 (file)
--- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
@@ -54,19 +54,22 @@ spec:
               name: {{ .Values.profiling.portName }}
             {{- end }}
             {{ include "common.containerPorts" . | nindent 12  }}
+          startupProbe:
+            tcpSocket:
+              port: {{ .Values.service.internalPort }}
+            periodSeconds: {{ .Values.startup.periodSeconds }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
           # disable liveness probe when
           # debugging.enabled=true or profiling.enabled=true
           {{- if and .Values.liveness.enabled (not (or .Values.debug.enabled .Values.profiling.enabled)) }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
             - name: KEY_STORE_PASSWORD

diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index eea3483..52c343a 100644 (file)
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -56,16 +56,18 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: false
 
 readiness:
-  initialDelaySeconds: 10
   periodSeconds: 10
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+
 service:
   type: NodePort
   internalPort: 9516
@@ -96,7 +98,7 @@ resources:
       cpu: "1"
       memory: "2500Mi"
     requests:
-      cpu: "100m"
+      cpu: "200m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/_helpers.tpl b/kubernetes/aai/components/aai-graphadmin/templates/_helpers.tpl
index dd3a3fc..16e0f48 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/_helpers.tpl
+++ b/kubernetes/aai/components/aai-graphadmin/templates/_helpers.tpl
@@ -16,5 +16,12 @@
           sleep 3
         fi
       done
+  resources:
+    limits:
+      cpu: 50m
+      memory: 50Mi
+    requests:
+      cpu: 3m
+      memory: 20Mi
   {{ include "common.containerSecurityContext" . | indent 2 | trim }}
 {{- end -}}

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 411edb4..5f77f9f 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -193,18 +193,12 @@ spec:
           httpGet:
             port: {{ .Values.service.actuatorPort }}
             path: {{ .Values.liveness.path }}
-          {{- if .Values.liveness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{- end }}
         readinessProbe:
           httpGet:
             port: {{ .Values.service.actuatorPort }}
             path: {{ .Values.readiness.path }}
-          {{- if .Values.readiness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         startupProbe:
           httpGet:

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 9f8271d..c93a59f 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -218,8 +218,8 @@ readiness:
 
 startup:
   path: /actuator/health/liveness
-  failureThreshold: 60
-  periodSeconds: 5
+  failureThreshold: 90
+  periodSeconds: 2
 
 actuator:
   echo:

diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index bc05f64..3427629 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -115,7 +115,7 @@ resources:
       cpu: "1"
       memory: "4Gi"
     requests:
-      cpu: "500m"
+      cpu: "200m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 6dde781..28940e1 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -133,9 +133,6 @@ spec:
           httpGet:
             port: {{ .Values.service.metricsPort }}
             path: {{ .Values.liveness.path }}
-          {{- if .Values.liveness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
           timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
         {{- end }}
@@ -143,9 +140,6 @@ spec:
           httpGet:
             port: {{ .Values.service.metricsPort }}
             path: {{ .Values.readiness.path }}
-          {{- if .Values.readiness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
           timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
         startupProbe:

diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 838426e..0d197a8 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -270,8 +270,8 @@ readiness:
 
 startup:
   path: /actuator/health/liveness
-  failureThreshold: 60
-  periodSeconds: 5
+  failureThreshold: 90
+  periodSeconds: 2
   timeoutSeconds: 3
 
 actuator:
@@ -316,8 +316,8 @@ resources:
       cpu: "2"
       memory: "4Gi"
     requests:
-      cpu: "1"
-      memory: "3Gi"
+      cpu: "500m"
+      memory: "2Gi"
   large:
     limits:
       cpu: "8"

diff --git a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
index a0c532e..768872e 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
@@ -103,19 +103,22 @@ spec:
         - containerPort: {{ .Values.service.profilingPort }}
           name: {{ .Values.service.profilingPortName }}
         {{- end }}
+        startupProbe:
+          tcpSocket:
+            port: {{ .Values.service.appPort }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
         # disable liveness probe when
         # debugging.enabled=true or profiling.enabled=true
         {{- if and .Values.liveness.enabled (not (or .Values.debug.enabled .Values.profiling.enabled)) }}
         livenessProbe:
           tcpSocket:
             port: {{ .Values.service.appPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end }}
         readinessProbe:
           tcpSocket:
             port: {{ .Values.service.appPort }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}

diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index f88d73f..a0d1f39 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -109,13 +109,15 @@ affinity: {}
 # probe configuration parameters
 liveness:
   enabled: true
-  initialDelaySeconds: 60
   periodSeconds: 60
 
 readiness:
-  initialDelaySeconds: 60
   periodSeconds: 10
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+
 service:
   type: ClusterIP
   appPortName: http
@@ -158,7 +160,7 @@ resources:
       cpu: "2"
       memory: "4Gi"
     requests:
-      cpu: "1"
+      cpu: "300m"
       memory: "3Gi"
   large:
     limits:

diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 517601b..b8aea43 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -103,25 +103,23 @@ spec:
         - name: JVM_ARGS
           value: {{ .Values.debug.args | quote }}
         {{- end }}
+        startupProbe:
+          tcpSocket:
+            port: {{ .Values.service.internalPort }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
         # disable liveness probe when
         # debugging.enabled=true or profiling.enabled=true
         {{- if and .Values.liveness.enabled (not (or .Values.debug.enabled .Values.profiling.enabled)) }}
         livenessProbe:
           tcpSocket:
             port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{- end }}
         readinessProbe:
           tcpSocket:
             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:

diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml
index 16fbf7f..5b868e6 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@ -92,19 +92,17 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
   periodSeconds: 10
 
 startup:
   failureThreshold: 90
-  periodSeconds: 1
+  periodSeconds: 2
 
 service:
   type: NodePort

diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index 36e1cbe..3972b0d 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -139,6 +139,12 @@ spec:
                   while (netstat -an | grep ESTABLISHED | grep -e $INTERNAL_PORT_1)
                   do sleep 3
                   done
+        startupProbe:
+          httpGet:
+            port: {{ .Values.service.metricsPort }}
+            path: {{ .Values.startup.path }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
         # disable liveness probe when
         # debugging.enable=true or profiling.enabled=true
         {{- if and .Values.liveness.enabled (not (or .Values.config.debug.enabled .Values.config.profiling.enabled)) }}
@@ -146,18 +152,12 @@ spec:
           httpGet:
             port: {{ .Values.service.metricsPort }}
             path: {{ .Values.liveness.path }}
-          {{- if .Values.liveness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{- end }}
         readinessProbe:
           httpGet:
             port: {{ .Values.service.metricsPort }}
             path: {{ .Values.readiness.path }}
-          {{- if .Values.readiness.initialDelaySeconds }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          {{- end }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index bbd336d..896f681 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -267,15 +267,18 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /actuator/health
-  initialDelaySeconds: 60
   periodSeconds: 60
   enabled: true
 
 readiness:
   path: /actuator/health/readiness
-  initialDelaySeconds: 10
   periodSeconds: 10
 
+startup:
+  path: /actuator/health
+  periodSeconds: 2
+  failureThreshold: 90
+
 actuator:
   echo:
     enabled: true
@@ -323,7 +326,7 @@ resources:
       cpu: "2"
       memory: "4Gi"
     requests:
-      cpu: "1"
+      cpu: "500m"
       memory: "3Gi"
   large:
     limits:

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 1490c8d..1d570ca 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -472,8 +472,8 @@ resources:
       cpu: "2"
       memory: "4Gi"
     requests:
-      cpu: "500m"
-      memory: "1200Mi"
+      cpu: "300m"
+      memory: "500Mi"
   large:
     limits:
       cpu: "4"

diff --git a/kubernetes/authentication/values.yaml b/kubernetes/authentication/values.yaml
index 0d16eb7..d5ef6d2 100644 (file)
--- a/kubernetes/authentication/values.yaml
+++ b/kubernetes/authentication/values.yaml
@@ -100,8 +100,8 @@ oauth2-proxy:
       cpu: 500m
       memory: 500Mi
     requests:
-      cpu: 500m
-      memory: 500Mi
+      cpu: 200m
+      memory: 200Mi
 
   initContainers:
     waitForRedis:

diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 5cb6c40..5f6fc06 100755 (executable)
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -100,7 +100,7 @@ resources:
       cpu: "1"
       memory: "200Mi"
     requests:
-      cpu: "0.5"
+      cpu: "300m"
       memory: "200Mi"
   large:
     limits:

diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index 2b24097..1a76b36 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -43,15 +43,19 @@ spec:
             httpGet:
               path: /api/v1/sdclistener/healthcheck
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{end}}
           readinessProbe:
             httpGet:
               path: /api/v1/sdclistener/healthcheck
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+          startupProbe:
+            httpGet:
+              path: /api/v1/sdclistener/healthcheck
+              port: {{ .Values.service.internalPort }}
+            periodSeconds: {{ .Values.startup.periodSeconds }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
           volumeMounts:
           - mountPath: {{ .Values.config.appConfigDir }}/application.yaml
             name: {{ include "common.fullname" . }}-config

diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 4260965..10bb890 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -59,16 +59,18 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
   periodSeconds: 10
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+
 service:
   type: ClusterIP
   name: cds-sdc-listener
@@ -98,10 +100,10 @@ resources:
   small:
     limits:
       cpu: "1500m"
-      memory: "700Mi"
+      memory: "1000Mi"
     requests:
-      cpu: "0.5"
-      memory: "700Mi"
+      cpu: "200m"
+      memory: "500Mi"
   large:
     limits:
       cpu: "2"

diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index dbccd28..69b439d 100644 (file)
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -101,7 +101,7 @@ resources:
       cpu: "1"
       memory: "200Mi"
     requests:
-      cpu: "0.5"
+      cpu: "200m"
       memory: "200Mi"
   large:
     limits:

diff --git a/kubernetes/cps/components/cps-temporal/templates/deployment.yaml b/kubernetes/cps/components/cps-temporal/templates/deployment.yaml
index 143740d..478b91c 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/templates/deployment.yaml
+++ b/kubernetes/cps/components/cps-temporal/templates/deployment.yaml
@@ -77,15 +77,19 @@ spec:
           httpGet:
             port: {{ .Values.liveness.port }}
             path: {{ .Values.liveness.path }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           httpGet:
             port: {{ .Values.readiness.port }}
             path: {{ .Values.readiness.path }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+        startupProbe:
+          httpGet:
+            port: {{ .Values.startup.port }}
+            path: {{ .Values.startup.path }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
         env:
           - name: SPRING_PROFILES_ACTIVE
             value: {{ .Values.config.spring.profile }}

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index 2b005ce..1739c4a 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -81,8 +81,8 @@ resources:
       cpu: "3"
       memory: "2Gi"
     requests:
-      cpu: "1"
-      memory: "2Gi"
+      cpu: "300m"
+      memory: "1Gi"
   large:
     limits:
       cpu: "4"
@@ -93,7 +93,6 @@ resources:
   unlimited: {}
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 20
   periodSeconds: 20
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
@@ -102,11 +101,16 @@ liveness:
   port: *mgt_port
 
 readiness:
-  initialDelaySeconds: 15
   periodSeconds: 15
   path: /manage/health
   port: *mgt_port
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+  path: /manage/health
+  port: *mgt_port
+
 ingress:
   enabled: true
   service:

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
index 351f883..66bf1dc 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
@@ -80,15 +80,19 @@ spec:
           httpGet:
             port: {{ .Values.liveness.port }}
             path: {{ .Values.liveness.path }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           httpGet:
             port: {{ .Values.readiness.port }}
             path: {{ .Values.readiness.path }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+        startupProbe:
+          httpGet:
+            port: {{ .Values.startup.port }}
+            path: {{ .Values.startup.path }}
+          periodSeconds: {{ .Values.startup.periodSeconds }}
+          failureThreshold: {{ .Values.startup.failureThreshold }}
         env:
           - name: SPRING_PROFILES_ACTIVE
             value: {{ .Values.config.spring.profile }}

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index d711c45..831fc36 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -85,7 +85,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "1Gi"
   large:
     limits:
@@ -97,7 +97,6 @@ resources:
   unlimited: {}
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 20
   periodSeconds: 20
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
@@ -106,11 +105,16 @@ liveness:
   port: *svc_port
 
 readiness:
-  initialDelaySeconds: 15
   periodSeconds: 15
   path: /actuator/health
   port: *svc_port
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+  path: /actuator/health
+  port: *svc_port
+
 ingress:
   enabled: true
   service:

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
index f7c9381..8a842d4 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
@@ -85,7 +85,7 @@ resources:
       cpu: "2"
       memory: "500Mi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "500Mi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
index f45905c..f0e3bbb 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
@@ -120,7 +120,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "500m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
index 36e1d7b..3ca297c 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
@@ -124,7 +124,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "300m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
index e77d318..b8d4a02 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -217,7 +217,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 8b8f928..7e73016 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -63,14 +63,14 @@ resources:
       cpu: "2"
       memory: "500Mi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "500Mi"
   large:
     limits:
       cpu: "4"
       memory: "1Gi"
     requests:
-      cpu: "2"
+      cpu: "500m"
       memory: "1Gi"
   unlimited: {}
 

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index d8b2b20..0f7ed9b 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -193,7 +193,7 @@ resources:
       cpu: "2"
       memory: "3Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "3Gi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index fb2a761..fcab0fb 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -283,7 +283,7 @@ resources:
       cpu: "2"
       memory: "1.5Gi"
     requests:
-      cpu: "1"
+      cpu: "500m"
       memory: "1.5Gi"
   large:
     limits:

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index c5d9b18..c06ba2f 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -58,7 +58,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml
index 20c02be..3382cc3 100755 (executable)
--- a/kubernetes/policy/components/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml
@@ -145,7 +145,6 @@ spec:
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{- end }}
           readinessProbe:
@@ -158,9 +157,19 @@ spec:
               scheme: HTTP
             successThreshold: {{ .Values.readiness.successThreshold }}
             failureThreshold: {{ .Values.readiness.failureThreshold }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
             timeoutSeconds: {{ .Values.readiness.timeout }}
+          startupProbe:
+            httpGet:
+              path: {{ .Values.startup.api }}
+              port: {{ .Values.service.internalPort }}
+              httpHeaders:
+                - name: Authorization
+                  value: Basic {{ printf "%s:%s" .Values.restServer.user .Values.restServer.password | b64enc }}
+              scheme: HTTP
+            periodSeconds: {{ .Values.startup.periodSeconds }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
+            timeoutSeconds: {{ .Values.startup.timeout }}
           volumeMounts:
           - name: logs
             mountPath: /var/log/onap

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 13be887..6cee389 100644 (file)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -93,20 +93,24 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 120
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
   periodSeconds: 120
   api: /policy/api/v1/healthcheck
   successThreshold: 1
   failureThreshold: 3
   timeout: 120
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+  api: /policy/api/v1/healthcheck
+  timeout: 120
+
 service:
   type: ClusterIP
   name: policy-api

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 047394d..f73ba98 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -148,7 +148,7 @@ resources:
       cpu: "3"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "300m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/sdnc/components/dgbuilder/values.yaml b/kubernetes/sdnc/components/dgbuilder/values.yaml
index 67828b9..8a30652 100644 (file)
--- a/kubernetes/sdnc/components/dgbuilder/values.yaml
+++ b/kubernetes/sdnc/components/dgbuilder/values.yaml
@@ -155,7 +155,7 @@ resources:
       cpu: "2"
       memory: "4Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "2Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
index 372224c..8972299 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
@@ -85,15 +85,18 @@ spec:
         readinessProbe:
           tcpSocket:
             port: {{ index .Values.readinessProbe.port }}
-          initialDelaySeconds: {{ index .Values.readinessProbe.initialDelaySeconds}}
           periodSeconds: {{ index .Values.readinessProbe.periodSeconds}}
         livenessProbe:
           tcpSocket:
             port: {{ index .Values.livenessProbe.port }}
-          initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}}
           periodSeconds: {{ index .Values.livenessProbe.periodSeconds}}
           successThreshold: {{ index .Values.livenessProbe.successThreshold}}
           failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
+        startupProbe:
+          tcpSocket:
+            port: {{ index .Values.startupProbe.port }}
+          periodSeconds: {{ index .Values.startupProbe.periodSeconds}}
+          failureThreshold: {{ index .Values.startupProbe.failureThreshold}}
 
         ports: {{ include "common.containerPorts" . | nindent 10  }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index c61de00..f1715e5 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -121,7 +121,7 @@ flavor: small
 resources:
   small:
     requests:
-      cpu: "1"
+      cpu: "0.3"
       memory: "1Gi"
     limits:
       cpu: "2"
@@ -136,16 +136,19 @@ resources:
   unlimited: {}
 readinessProbe:
   port: 9091
-  initialDelaySeconds: 40
   periodSeconds: 10
   timeoutSeconds: 10
 livenessProbe:
   port: 9091
-  initialDelaySeconds: 80
   periodSeconds: 10
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
+startupProbe:
+  port: 9091
+  periodSeconds: 2
+  failureThreshold: 90
+  timeoutSeconds: 10
 ingress:
   enabled: false
   service:

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 84405dd..b9aa5b1 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -182,7 +182,7 @@ resources:
       cpu: "2"
       memory: "3Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "3Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml b/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml
index 040fbad..af27027 100644 (file)
--- a/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/templates/deployment.yaml
@@ -61,10 +61,14 @@ spec:
           livenessProbe:
             tcpSocket:
               port: {{ index .Values.livenessProbe.port }}
-            initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}}
             periodSeconds: {{ index .Values.livenessProbe.periodSeconds}}
             successThreshold: {{ index .Values.livenessProbe.successThreshold}}
             failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
+          startupProbe:
+            tcpSocket:
+              port: {{ index .Values.startupProbe.port }}
+            periodSeconds: {{ index .Values.startupProbe.periodSeconds}}
+            failureThreshold: {{ index .Values.startupProbe.failureThreshold}}
           ports: {{ include "common.containerPorts" . | nindent 12  }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:

diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml
index 2717170..23f6886 100644 (file)
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -118,7 +118,7 @@ resources:
       cpu: "4"
       memory: "4Gi"
     requests:
-      cpu: "2"
+      cpu: "500m"
       memory: "1Gi"
   large:
     limits:
@@ -133,10 +133,15 @@ livenessProbe:
   port: *containerPort
   periodSeconds: 20
   timeoutSeconds: 10
-  initialDelaySeconds: 60
   successThreshold: 1
   failureThreshold: 3
 
+startupProbe:
+  port: *containerPort
+  periodSeconds: 2
+  failureThreshold: 90
+  timeoutSeconds: 10
+
 ingress:
   enabled: false
   service:

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index ad55487..23ce157 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -130,7 +130,7 @@ resources:
       cpu: "1"
       memory: "3Gi"
     requests:
-      cpu: "0.5"
+      cpu: "200m"
       memory: "2Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index 1f6d177..d45a0d9 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -99,7 +99,7 @@ resources:
       cpu: "1"
       memory: "1Gi"
     requests:
-      cpu: "0.5"
+      cpu: "300m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index f3d55c2..37021a2 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -107,7 +107,7 @@ resources:
       cpu: "1"
       memory: "3Gi"
     requests:
-      cpu: "0.5"
+      cpu: "200m"
       memory: "2Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml
index 5aea302..e1415ef 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml
@@ -79,11 +79,19 @@ spec:
               path: {{ index .Values.livenessProbe.path}}
               port: {{ index .Values.containerPort }}
               scheme: {{ index .Values.livenessProbe.scheme}}
-            initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}}
             periodSeconds: {{ index .Values.livenessProbe.periodSeconds}}
             timeoutSeconds: {{ index .Values.livenessProbe.timeoutSeconds}}
             successThreshold: {{ index .Values.livenessProbe.successThreshold}}
             failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
+          startupProbe:
+            httpGet:
+              path: {{ index .Values.startupProbe.path}}
+              port: {{ index .Values.containerPort }}
+              scheme: {{ index .Values.startupProbe.scheme}}
+            periodSeconds: {{ index .Values.startupProbe.periodSeconds}}
+            timeoutSeconds: {{ index .Values.startupProbe.timeoutSeconds}}
+            successThreshold: {{ index .Values.startupProbe.successThreshold}}
+            failureThreshold: {{ index .Values.startupProbe.failureThreshold}}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: logs

diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 25390e1..471e331 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -134,7 +134,7 @@ resources:
       cpu: "2"
       memory: "2Gi"
     requests:
-      cpu: "1"
+      cpu: "200m"
       memory: "2Gi"
   large:
     limits:
@@ -148,11 +148,18 @@ livenessProbe:
   path: /manage/health
   port: 8088
   scheme: HTTP
-  initialDelaySeconds: 600
   periodSeconds: 60
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
+startupProbe:
+  path: /manage/health
+  port: 8088
+  scheme: HTTP
+  periodSeconds: 2
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 90
 ingress:
   enabled: false
 serviceMesh:

diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 7eff6c4..adaf2bd 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -116,7 +116,7 @@ resources:
       cpu: "1"
       memory: "1Gi"
     requests:
-      cpu: "0.5"
+      cpu: "200m"
       memory: "1Gi"
   large:
     limits:

diff --git a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
index 247b8cb..5837944 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
@@ -60,6 +60,7 @@ spec:
         - name: {{ include "common.fullname" . }}-logs
           mountPath: /var/log/onap
 {{ include "so.helpers.livenessProbe" .| indent 8 }}
+{{ include "so.helpers.startupProbe" .| indent 8 }}
         ports: {{- include "common.containerPorts" . | nindent 10  }}
       # Filebeat sidecar container
       {{ include "common.log.sidecar" . | nindent 6 }}

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 0b34cc0..8a37e34 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -144,11 +144,17 @@ livenessProbe:
   path: /manage/health
   port: 8087
   scheme: HTTP
-  initialDelaySeconds: 600
   periodSeconds: 60
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
+startupProbe:
+  path: /manage/health
+  port: 8087
+  scheme: HTTP
+  periodSeconds: 2
+  failureThreshold: 90
+  timeoutSeconds: 10
 ingress:
   enabled: false
 serviceMesh:

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 2a9114d..e3e7421 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -133,7 +133,7 @@ resources:
       cpu: "2"
       memory: "1.5Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "1.5Gi"
   large:
     limits:

diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index dcf04b0..fb7db19 100755 (executable)
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -60,6 +60,7 @@ spec:
         - name: {{ include "common.fullname" . }}-logs
           mountPath: {{ .Values.log.path }}
 {{ include "so.helpers.livenessProbe" .| indent 8 }}
+{{ include "so.helpers.startupProbe" .| indent 8 }}
         ports: {{ include "common.containerPorts" . | nindent 10  }}
       # Filebeat sidecar container
       {{ include "common.log.sidecar" . | nindent 6 }}

diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index 157a019..e1a1a96 100644 (file)
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -117,7 +117,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "200Mi"
   large:
     limits:

diff --git a/kubernetes/uui/components/uui-llm-adaptation/values.yaml b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
index 66691af..5c1c77b 100644 (file)
--- a/kubernetes/uui/components/uui-llm-adaptation/values.yaml
+++ b/kubernetes/uui/components/uui-llm-adaptation/values.yaml
@@ -110,7 +110,7 @@ resources:
       cpu: "2"
       memory: "1Gi"
     requests:
-      cpu: "1"
+      cpu: "0.5"
       memory: "200Mi"
   large:
     limits:

diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index abbd35d..3d18674 100644 (file)
--- a/kubernetes/uui/templates/deployment.yaml
+++ b/kubernetes/uui/templates/deployment.yaml
@@ -62,14 +62,17 @@ spec:
           livenessProbe:
             tcpSocket:
               port: {{ index .Values.service.ports 0 "port" }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end -}}
           readinessProbe:
             tcpSocket:
               port: {{ index .Values.service.ports 0 "port" }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+          startupProbe:
+            tcpSocket:
+              port: {{ index .Values.service.ports 0 "port" }}
+            periodSeconds: {{ .Values.startup.periodSeconds }}
+            failureThreshold: {{ .Values.startup.failureThreshold }}
           volumeMounts:
           - mountPath: /home/uui/server.xml
             name: config

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index a931c1e..7889687 100644 (file)
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -48,16 +48,18 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
   periodSeconds: 10
 
+startup:
+  periodSeconds: 2
+  failureThreshold: 90
+
 service:
   type: ClusterIP
   name: uui