fix: livenessProb/readinessProb might conflict when run logrotate at …

…same time
kubeovn · Dec 18, 2020 · f922ef7 · f922ef7
1 parent 9e5d98d
commit f922ef7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -700,14 +700,14 @@ spec:
           readinessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovn-is-leader.sh
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovn-healthcheck.sh
             initialDelaySeconds: 30
             periodSeconds: 7
@@ -882,14 +882,14 @@ spec:
           readinessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovs-dpdk-healthcheck.sh
             periodSeconds: 5
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovs-dpdk-healthcheck.sh
             initialDelaySeconds: 10
             periodSeconds: 5
@@ -1204,14 +1204,15 @@ spec:
           readinessProbe:
             exec:
               command:
-                - sh
-                - /kube-ovn/ovn-is-leader.sh
+                - bash
+                - -c
+                - LOG_ROTATE=true /kube-ovn/ovn-is-leader.sh
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovn-healthcheck.sh
             initialDelaySeconds: 30
             periodSeconds: 7
@@ -1383,14 +1384,14 @@ spec:
           readinessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovs-healthcheck.sh
             periodSeconds: 5
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/ovs-healthcheck.sh
             initialDelaySeconds: 10
             periodSeconds: 5
@@ -1520,14 +1521,14 @@ spec:
           readinessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/kube-ovn-controller-healthcheck.sh
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - sh
+                - bash
                 - /kube-ovn/kube-ovn-controller-healthcheck.sh
             initialDelaySeconds: 300
             periodSeconds: 7
@@ -1590,7 +1591,7 @@ spec:
         image: "$REGISTRY/kube-ovn:$VERSION"
         imagePullPolicy: $IMAGE_PULL_POLICY
         command:
-          - sh
+          - bash
           - /kube-ovn/start-cniserver.sh
         args:
           - --enable-mirror=$ENABLE_MIRROR

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1405,7 +1405,8 @@ spec:
             exec:
               command:
                 - bash
-                - /kube-ovn/ovs-healthcheck.sh
+                - -c
+                - LOG_ROTATE=true /kube-ovn/ovs-healthcheck.sh
             periodSeconds: 5
             timeoutSeconds: 45
           livenessProbe:
@@ -2169,7 +2170,6 @@ echo "-------------------------------"
 echo ""
 
 echo "[Step 6] Run network diagnose"
-sleep 60
 kubectl ko diagnose all
 
 echo "-------------------------------"

diff --git a/dist/images/ovs-healthcheck.sh b/dist/images/ovs-healthcheck.sh
@@ -3,9 +3,13 @@ set -euo pipefail
 shopt -s expand_aliases
 
 OVN_DB_IPS=${OVN_DB_IPS:-}
+ENABLE_SSL=${ENABLE_SSL:-false}
+LOG_ROTATE=${LOG_ROTATE:-false}
 
-logrotate /etc/logrotate.d/openvswitch
-logrotate /etc/logrotate.d/ovn
+if [[ "$LOG_ROTATE" == "true" ]]; then
+  logrotate /etc/logrotate.d/openvswitch
+  logrotate /etc/logrotate.d/ovn
+fi
 
 function gen_conn_str {
   if [[ -z "${OVN_DB_IPS}" ]]; then