[CI] Update k8s probes [skip ci]

spring-cloud · Jan 29, 2024 · 24fee74 · 24fee74
1 parent a0b1df8
commit 24fee74
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 34 deletions.
diff --git a/src/carvel/config/dataflow-deployment.yml b/src/carvel/config/dataflow-deployment.yml
@@ -49,9 +49,8 @@ spec:
         ports:
         - containerPort: 9393
         startupProbe:
-          httpGet:
+          tcpSocket:
             port: 9393
-            path: #@ dataflow_liveness_path()
           failureThreshold: 4
           initialDelaySeconds: 10
           timeoutSeconds: 3

diff --git a/src/carvel/config/skipper-deployment.yml b/src/carvel/config/skipper-deployment.yml
@@ -41,24 +41,23 @@ spec:
         ports:
         - containerPort: 7577
         startupProbe:
-          httpGet:
+          tcpSocket:
             port: 7577
-            path: /actuator
           failureThreshold: 4
           initialDelaySeconds: 10
           timeoutSeconds: 3
           periodSeconds: 15
         livenessProbe:
           httpGet:
-            path: /actuator/health
+            path: /actuator/health/liveness
             port: 7577
           failureThreshold: 4
           initialDelaySeconds: 1
           timeoutSeconds: 3
           periodSeconds: 15
         readinessProbe:
           httpGet:
-            path: /actuator/info
+            path: /actuator/health/readiness
             port: 7577
           failureThreshold: 3
           initialDelaySeconds: 5

diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
@@ -120,7 +120,7 @@ if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
     case $BROKER in
     "kafka")
         # TODO get version from yaml spec.template.spec.containers[0].image
-        sh "$SCDIR/load-image.sh" "confluentinc/cp-kafka:5"
+        sh "$SCDIR/load-image.sh" "confluentinc/cp-kafka:5.5.2"
         sh "$SCDIR/load-image.sh" "confluentinc/cp-zookeeper:5"
         ;;
     "rabbit" | "rabbitmq")

diff --git a/src/deploy/k8s/yaml/server-deployment-pro.yaml b/src/deploy/k8s/yaml/server-deployment-pro.yaml
@@ -30,18 +30,17 @@ spec:
               containerPort: 9393
           livenessProbe:
             httpGet:
-              path: /management/health
+              path: /management/health/liveness
               port: 9393
             initialDelaySeconds: 45
           readinessProbe:
             httpGet:
-              path: /management/info
+              path: /management/health/readiness
               port: 9393
             initialDelaySeconds: 45
           startupProbe:
-            httpGet:
+            tcpSocket:
               port: 9393
-              path: /management/health
             failureThreshold: 3
             timeoutSeconds: 3
             initialDelaySeconds: 60

diff --git a/src/deploy/k8s/yaml/server-deployment.yaml b/src/deploy/k8s/yaml/server-deployment.yaml
@@ -30,12 +30,12 @@ spec:
               name: http
           livenessProbe:
             httpGet:
-              path: /management/health
+              path: /management/health/liveness
               port: 9393
             initialDelaySeconds: 1
           readinessProbe:
             httpGet:
-              path: /management/info
+              path: /management/health/readiness
               port: 9393
             initialDelaySeconds: 1
           startupProbe:

diff --git a/src/deploy/k8s/yaml/skipper-deployment-pro.yaml b/src/deploy/k8s/yaml/skipper-deployment-pro.yaml
@@ -32,12 +32,12 @@ spec:
           name: jdwp-skipper
         livenessProbe:
           httpGet:
-            path: /actuator/health
+            path: /actuator/health/liveness
             port: 7577
           initialDelaySeconds: 1
         readinessProbe:
           httpGet:
-            path: /actuator/info
+            path: /actuator/health/readiness
             port: 7577
           initialDelaySeconds: 1
         startupProbe:

diff --git a/src/deploy/k8s/yaml/skipper-deployment.yaml b/src/deploy/k8s/yaml/skipper-deployment.yaml
@@ -32,12 +32,12 @@ spec:
           name: jdwp-skipper
         livenessProbe:
           httpGet:
-            path: /actuator/health
+            path: /actuator/health/liveness
             port: 7577
           initialDelaySeconds: 1
         readinessProbe:
           httpGet:
-            path: /actuator/info
+            path: /actuator/health/readiness
             port: 7577
           initialDelaySeconds: 1
         startupProbe:

diff --git a/src/deploy/versions.yaml b/src/deploy/versions.yaml
@@ -10,5 +10,5 @@ scdf-type:
     maintenance-snapshot: '1.5.4-SNAPSHOT'
 default:
   scdf-type: 'oss'
-  version: 'release'
+  version: 'snapshot'
   package-version: '2.11.3-SNAPSHOT'
diff --git a/src/docker-compose/docker-compose-kafka.yml b/src/docker-compose/docker-compose-kafka.yml
@@ -22,7 +22,7 @@ version: '3'
 services:
 
   kafka-broker:
-    image: confluentinc/cp-kafka:5
+    image: confluentinc/cp-kafka:5.5.2
     container_name: dataflow-kafka
     expose:
       - "9092"

diff --git a/src/kubernetes/mariadb/mariadb-deployment.yaml b/src/kubernetes/mariadb/mariadb-deployment.yaml
@@ -29,9 +29,10 @@ spec:
         ports:
           - containerPort: 3306
             name: mariadb
-        requests:
-          cpu: 2000m
-          memory: 1Gi
+        resources:
+          requests:
+            cpu: 2000m
+            memory: 1Gi
         volumeMounts:
           - name: data
             mountPath: /var/lib/mariadb

diff --git a/src/kubernetes/server/server-deployment.yaml b/src/kubernetes/server/server-deployment.yaml
@@ -29,14 +29,14 @@ spec:
         - containerPort: 9393
         livenessProbe:
           httpGet:
-            path: /management/health
+            path: /management/health/liveness
             port: 9393
-          initialDelaySeconds: 45
+          initialDelaySeconds: 0
         readinessProbe:
           httpGet:
-            path: /management/info
+            path: /management/health/readiness
             port: 9393
-          initialDelaySeconds: 45
+          initialDelaySeconds: 0
         startupProbe:
           tcpSocket:
             port: 9393

diff --git a/src/kubernetes/skipper/skipper-deployment.yaml b/src/kubernetes/skipper/skipper-deployment.yaml
@@ -29,14 +29,14 @@ spec:
         - containerPort: 7577
         livenessProbe:
           httpGet:
-            path: /actuator/health
+            path: /actuator/health/liveness
             port: 7577
           initialDelaySeconds: 1
           periodSeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
-            path: /actuator/info
+            path: /actuator/health/readiness
             port: 7577
           initialDelaySeconds: 1
           periodSeconds: 10

diff --git a/src/templates/kubernetes/server/server-deployment.yaml b/src/templates/kubernetes/server/server-deployment.yaml
@@ -29,14 +29,18 @@ spec:
         - containerPort: 8080
         livenessProbe:
           httpGet:
-            path: /management/health
+            path: /management/health/liveness
             port: 8080
-          initialDelaySeconds: 45
+          initialDelaySeconds: 0
         readinessProbe:
           httpGet:
-            path: /management/info
+            path: /management/health/readiness
             port: 8080
-          initialDelaySeconds: 45
+          initialDelaySeconds: 0
+        startupProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 15
         resources:
           limits:
             cpu: 1.0

diff --git a/src/templates/kubernetes/skipper/skipper-deployment.yaml b/src/templates/kubernetes/skipper/skipper-deployment.yaml
@@ -29,14 +29,14 @@ spec:
         - containerPort: 7577
         livenessProbe:
           httpGet:
-            path: /actuator/health
+            path: /actuator/health/liveness
             port: 7577
           initialDelaySeconds: 1
           periodSeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
-            path: /actuator/info
+            path: /actuator/health/readiness
             port: 7577
           initialDelaySeconds: 1
           periodSeconds: 10