[SDC] Improve sdc startup time

- remove initialDelaySeconds from probes
- adjust probe timeoutSeconds and failureThreshold
- change readinessCheck dependencies to reduce
  startup ordering bottlenecks
- disable autoscaling

Issue-ID: SDC-4816
Change-Id: Ib19e3fa94e64ded76c80a2bce9e8b2762f114175
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 4ce1f58..9b3bb3d 100644 (file)
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 13.0.8
+version: 13.1.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 196669a..6cbb5d9 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -34,7 +34,6 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
-        {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_service) | nindent 8 }}
         - name: {{ include "common.name" . }}-copy-jetty
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -62,7 +61,6 @@ spec:
             httpGet:
               path: {{ .Values.liveness.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
             timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
             successThreshold: {{ .Values.liveness.successThreshold }}
@@ -72,7 +70,6 @@ spec:
             httpGet:
               path: {{ .Values.readiness.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
             timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
             successThreshold: {{ .Values.readiness.successThreshold }}
@@ -81,7 +78,6 @@ spec:
             httpGet:
               path: {{ .Values.startup.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
             timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
             successThreshold: {{ .Values.startup.successThreshold }}

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 8f4b221..36d0bcc 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -92,9 +92,8 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /sdc2/rest/healthCheck
-  initialDelaySeconds: 1
   periodSeconds: 10
-  timeoutSeconds: 180
+  timeoutSeconds: 15
   successThreshold: 1
   failureThreshold: 3
   # necessary to disable liveness probe when setting breakpoints
@@ -103,19 +102,17 @@ liveness:
 
 readiness:
   path: /sdc2/rest/healthCheck
-  initialDelaySeconds: 1
   periodSeconds: 10
-  timeoutSeconds: 180
+  timeoutSeconds: 15
   successThreshold: 1
   failureThreshold: 3
 
 startup:
   path: /sdc2/rest/healthCheck
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  timeoutSeconds: 180
+  periodSeconds: 5
+  timeoutSeconds: 15
   successThreshold: 1
-  failureThreshold: 60
+  failureThreshold: 120
 
 service:
   type: NodePort
@@ -178,10 +175,6 @@ serviceAccount:
     - read
 
 readinessCheck:
-  wait_for_service:
-    name: "services"
-    services:
-      - sdc-onboarding-be
   job_wait_for:
     timeout: 25
     services:
@@ -345,7 +338,7 @@ be:
   truststorePassword: ""
 
 autoscaling:
-  enabled: true
+  enabled: false
   minReplicas: 1
   maxReplicas: 3
   targetCPUUtilizationPercentage: 75

diff --git a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
index 8a74c67..ba8d6b8 100644 (file)
--- a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
@@ -71,7 +71,6 @@ spec:
               command:
                 - /bin/sh
                 - /opt/scripts/combined-liveness.sh
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
             timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
             successThreshold: {{ .Values.liveness.successThreshold }}
@@ -82,7 +81,6 @@ spec:
               command:
                 - /bin/sh
                 - /opt/scripts/combined-liveness.sh
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
             timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
             successThreshold: {{ .Values.readiness.successThreshold }}
@@ -90,7 +88,6 @@ spec:
           startupProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
             timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
             successThreshold: {{ .Values.startup.successThreshold }}

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index a02ae0e..269aa18 100644 (file)
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -66,7 +66,6 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 1
   periodSeconds: 10
   timeoutSeconds: 30
   successThreshold: 1
@@ -76,18 +75,16 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 1
   periodSeconds: 10
   timeoutSeconds: 30
   successThreshold: 1
   failureThreshold: 3
 
 startup:
-  initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 5
   timeoutSeconds: 15
   successThreshold: 1
-  failureThreshold: 60
+  failureThreshold: 120
 
 service:
   type: NodePort
@@ -141,8 +138,8 @@ serviceAccount:
 
 readinessCheck:
   wait_for:
-    jobs:
-      - '{{ include "common.release" . }}-sdc-be'
+    services:
+      - sdc-be
 
 #Log configuration
 log:

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
index d1d2081..19b7402 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
@@ -62,7 +62,6 @@ spec:
             httpGet:
               path: {{ .Values.liveness.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
             timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
             successThreshold: {{ .Values.liveness.successThreshold }}
@@ -72,7 +71,6 @@ spec:
             httpGet:
               path: {{ .Values.readiness.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
             timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
             successThreshold: {{ .Values.readiness.successThreshold }}
@@ -81,7 +79,6 @@ spec:
             httpGet:
               path: {{ .Values.startup.path }}
               port: {{ .Values.service.internalPort }}
-            initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
             timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
             successThreshold: {{ .Values.startup.successThreshold }}

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index f44172c..e79a87e 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -86,7 +86,6 @@ spec:
           httpGet:
             path:  /healthz
             port: {{ .Values.service.jobPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
           timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           successThreshold: {{ .Values.liveness.successThreshold }}
@@ -96,7 +95,6 @@ spec:
           httpGet:
             path:  /healthz
             port: {{ .Values.service.jobPort }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
           timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
           successThreshold: {{ .Values.readiness.successThreshold }}

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 9ceaf3f..a43014b 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -71,7 +71,6 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /onboarding-api/v1.0/healthcheck
-  initialDelaySeconds: 1
   periodSeconds: 10
   timeoutSeconds: 15
   successThreshold: 1
@@ -82,7 +81,6 @@ liveness:
 
 readiness:
   path: /onboarding-api/v1.0/healthcheck
-  initialDelaySeconds: 1
   periodSeconds: 10
   timeoutSeconds: 15
   successThreshold: 1
@@ -90,11 +88,10 @@ readiness:
 
 startup:
   path: /onboarding-api/v1.0/healthcheck
-  initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 5
   timeoutSeconds: 15
   successThreshold: 1
-  failureThreshold: 60
+  failureThreshold: 120
 
 service:
   type: ClusterIP