Revert "Use etcd's /health endpoint for readiness checking"

This reverts commit b401acf because it causes etcd metrics to be exposed insecurely.
openshift · Nov 19, 2020 · c875f9f · c875f9f
1 parent 539906e
commit c875f9f
Show file tree

Hide file tree

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

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