fix: Add readiness check to controller. Fixes #8283 (#8285)

Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Apr 13, 2022 · 283f6b5 · 283f6b5
1 parent 75b533b
commit 283f6b5
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 7 deletions.
diff --git a/manifests/base/workflow-controller/workflow-controller-deployment.yaml b/manifests/base/workflow-controller/workflow-controller-deployment.yaml
@@ -6,6 +6,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -35,10 +37,15 @@ spec:
           ports:
             - name: metrics
               containerPort: 9090
-            - containerPort: 6060
+            - name: healthz
+              containerPort: 6060
+          readinessProbe:
+            httpGet:
+              port: metrics
+              path: /metrics
           livenessProbe:
             httpGet:
-              port: 6060
+              port: healthz
               path: /healthz
             # Require three failures to tolerate transient errors.
             failureThreshold: 3

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -1105,6 +1105,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -1125,7 +1127,7 @@ spec:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: 6060
+            port: healthz
           initialDelaySeconds: 90
           periodSeconds: 60
           timeoutSeconds: 30
@@ -1134,6 +1136,11 @@ spec:
         - containerPort: 9090
           name: metrics
         - containerPort: 6060
+          name: healthz
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: metrics
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -994,6 +994,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -1015,7 +1017,7 @@ spec:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: 6060
+            port: healthz
           initialDelaySeconds: 90
           periodSeconds: 60
           timeoutSeconds: 30
@@ -1024,6 +1026,11 @@ spec:
         - containerPort: 9090
           name: metrics
         - containerPort: 6060
+          name: healthz
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: metrics
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
@@ -1406,6 +1406,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -1427,7 +1429,7 @@ spec:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: 6060
+            port: healthz
           initialDelaySeconds: 90
           periodSeconds: 60
           timeoutSeconds: 30
@@ -1436,6 +1438,11 @@ spec:
         - containerPort: 9090
           name: metrics
         - containerPort: 6060
+          name: healthz
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: metrics
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
@@ -1495,6 +1495,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -1516,7 +1518,7 @@ spec:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: 6060
+            port: healthz
           initialDelaySeconds: 90
           periodSeconds: 60
           timeoutSeconds: 30
@@ -1525,6 +1527,11 @@ spec:
         - containerPort: 9090
           name: metrics
         - containerPort: 6060
+          name: healthz
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: metrics
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
@@ -1487,6 +1487,8 @@ spec:
   selector:
     matchLabels:
       app: workflow-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -1508,7 +1510,7 @@ spec:
           failureThreshold: 3
           httpGet:
             path: /healthz
-            port: 6060
+            port: healthz
           initialDelaySeconds: 90
           periodSeconds: 60
           timeoutSeconds: 30
@@ -1517,6 +1519,11 @@ spec:
         - containerPort: 9090
           name: metrics
         - containerPort: 6060
+          name: healthz
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: metrics
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: