Update probes

Author: engapa

k8s/kafka-persistent.yaml

@@ -86,7 +86,7 @@ spec:
         - name:  SERVER_log_retention_hours
           value: "2147483647"
         - name:  SERVER_zookeeper_connect
-          value: "zk-0.zk:2181,zk-1.zk:2181,zk-2.zk:2181"
+          value: "zk-0.zk:2181"
         - name:  SERVER_log_dirs
           value: "/opt/kafka/data/logs"
         - name:  SERVER_zookeeper_connection_timeout_ms
@@ -95,14 +95,14 @@ spec:
           exec:
             command:
             - kafka_server_status.sh
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
+          initialDelaySeconds: 50
+          timeoutSeconds: 60
         readinessProbe:
           exec:
             command:
             - kafka_server_status.sh
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
+          initialDelaySeconds: 50
+          timeoutSeconds: 60
         volumeMounts:
         - name: data
           mountPath: /opt/kafka/data
@@ -111,7 +111,6 @@ spec:
       name: data
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "standard"
       resources:
         requests:
           storage: 1Gi

k8s/kafka-zk-persistent.yaml

@@ -106,15 +106,15 @@ spec:
         readinessProbe:
           exec:
             command:
-            - kafka_server_status.sh
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
+              - kafka_server_status.sh
+          initialDelaySeconds: 60
+          timeoutSeconds: 30
         livenessProbe:
           exec:
             command:
-            - kafka_server_status.sh
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
+              - kafka_server_status.sh
+          initialDelaySeconds: 60
+          timeoutSeconds: 30
         volumeMounts:
         - name: kafka-data
           mountPath: /opt/kafka/data
@@ -127,23 +127,20 @@ spec:
       name: kafka-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "standard"
       resources:
         requests:
           storage: 1Gi
   - metadata:
       name: zk-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "standard"
       resources:
         requests:
           storage: 1Gi
   - metadata:
       name: zk-datalog
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "standard"
       resources:
         requests:
           storage: 1Gi

k8s/kafka-zk.yaml

@@ -75,12 +75,12 @@ spec:
 #        livenessProbe:
 #          exec:
 #            command:
-#            - kafka_server_status.sh
+#              - kafka_server_status.sh
 #          initialDelaySeconds: 60
 #          timeoutSeconds: 60
 #        readinessProbe:
 #          exec:
 #            command:
-#            - kafka_server_status.sh
+#              - kafka_server_status.sh
 #          initialDelaySeconds: 60
 #          timeoutSeconds: 60

k8s/main.sh

@@ -78,7 +78,7 @@ function check()
       echo "ERROR: Max number of attempts was reached (${MAX_ATTEMPTS})"
       exit 1
     fi
-   READY_REPLICAS=$(kubectl get -f $1 -o jsonpath='{.items[?(@.kind=="StatefulSet")].status.currentReplicas}' 2>&1)
+   READY_REPLICAS=$(kubectl get -f $1 -o jsonpath='{.items[?(@.kind=="StatefulSet")].status.readyReplicas}' 2>&1)
    echo "[${ATTEMPTS}/${MAX_ATTEMPTS}] - Ready replicas : ${READY_REPLICAS:-0}/$REPLICAS ... "
   done
   kubectl get all

kafka_server_status.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
-### Default properties
+### bootstrap servers, timeout
+timeout=${1:-60}
+bootstrap_servers=${2:-"localhost:${SERVER_port}"}
 
-timeout 30 $KAFKA_HOME/bin/kafka-topics.sh --bootstrap-server localhost:${SERVER_port} --list > /dev/null 2>&1
+timeout $timeout $KAFKA_HOME/bin/kafka-topics.sh --bootstrap-server $bootstrap_servers --list > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
- echo -e "\033[32mKafka server is running, :-)\033[0m"
+ echo -e "\033[32mKafka topics list command executed successfully, :-)\033[0m"
  exit 0
 else
- echo -e "\033[31mKafka server is not running, :-(\033[0m"
+ echo -e "\033[31mKafka topics list command failed, :-(\033[0m"
  exit 1
 fi

openshift/main.sh

@@ -73,7 +73,7 @@ function check()
       echo "ERROR: Max number of attempts was reached (${MAX_ATTEMPTS})"
       exit 1
     fi
-    READY_REPLICAS=$(oc get statefulset -l component=${2:-kafka} -o jsonpath='{.items[?(@.kind=="StatefulSet")].status.currentReplicas}' 2>&1)
+    READY_REPLICAS=$(oc get statefulset -l component=${2:-kafka} -o jsonpath='{.items[?(@.kind=="StatefulSet")].status.readyReplicas}' 2>&1)
    echo "[${ATTEMPTS}/${MAX_ATTEMPTS}] - Ready replicas : ${READY_REPLICAS:-0}/$REPLICAS ... "
   done
   oc get all