Use etcd's /health endpoint for readiness checking

openshift · Oct 22, 2020 · b401acf · b401acf
1 parent e223dc4
commit b401acf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/bindata/etcd/pod.yaml b/bindata/etcd/pod.yaml
@@ -165,19 +165,17 @@ ${COMPUTED_ENV_VARS}
           --advertise-client-urls=https://${NODE_NODE_ENVVAR_NAME_IP}:2379 \
           --listen-client-urls=https://${LISTEN_ON_ALL_IPS}:2379 \
           --listen-peer-urls=https://${LISTEN_ON_ALL_IPS}:2380 \
-          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978 ||  mv /etc/kubernetes/etcd-backup-dir/etcd-member.yaml /etc/kubernetes/manifests
+          --listen-metrics-urls=https://${LISTEN_ON_ALL_IPS}:9978,http://${LISTEN_ON_ALL_IPS}:9989 ||  mv /etc/kubernetes/etcd-backup-dir/etcd-member.yaml /etc/kubernetes/manifests
     env:
 ${COMPUTED_ENV_VARS}
     resources:
       requests:
         memory: 600Mi
         cpu: 300m
     readinessProbe:
-      exec:
-        command:
-          - /bin/sh
-          - -ec
-          - "lsof -n -i :2380 | grep LISTEN"
+      httpGet:
+        path: /health
+        port: 9989
       failureThreshold: 3
       initialDelaySeconds: 3
       periodSeconds: 5

diff --git a/pkg/operator/etcd_assets/bindata.go b/pkg/operator/etcd_assets/bindata.go