Merge pull request #502 from ironcladlou/socket-probe

Bug 1844727: Use socket readiness probe to avoid generating zombies
openshift · Dec 1, 2020 · 06667d9 · 06667d9
2 parents a0ded63 + 7e7f499
commit 06667d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/bindata/etcd/pod.yaml b/bindata/etcd/pod.yaml
@@ -163,11 +163,8 @@ ${COMPUTED_ENV_VARS}
         memory: 600Mi
         cpu: 300m
     readinessProbe:
-      exec:
-        command:
-          - /bin/sh
-          - -ec
-          - "lsof -n -i :2380 | grep LISTEN"
+      tcpSocket:
+        port: 2380
       failureThreshold: 3
       initialDelaySeconds: 3
       periodSeconds: 5

diff --git a/bindata/etcd/restore-pod.yaml b/bindata/etcd/restore-pod.yaml
@@ -83,11 +83,8 @@ ${COMPUTED_ENV_VARS}
         memory: 600Mi
         cpu: 300m
     readinessProbe:
-      exec:
-        command:
-          - /bin/sh
-          - -ec
-          - "lsof -n -i :2380 | grep LISTEN"
+      tcpSocket:
+        port: 2380
       failureThreshold: 3
       initialDelaySeconds: 3
       periodSeconds: 5

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