fix: Add readiness check to controller. Fixes argoproj#8283

Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec · Mar 31, 2022 · 6a11a53 · 6a11a53
1 parent e50ec69
commit 6a11a53
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/manifests/base/workflow-controller/workflow-controller-deployment.yaml b/manifests/base/workflow-controller/workflow-controller-deployment.yaml
@@ -35,10 +35,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
@@ -1120,7 +1120,7 @@ spec:
  failureThreshold: 3
  httpGet:
  path: /healthz
- port: 6060
+ port: healthz
  initialDelaySeconds: 90
  periodSeconds: 60
  timeoutSeconds: 30
@@ -1129,6 +1129,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
@@ -1010,7 +1010,7 @@ spec:
  failureThreshold: 3
  httpGet:
  path: /healthz
- port: 6060
+ port: healthz
  initialDelaySeconds: 90
  periodSeconds: 60
  timeoutSeconds: 30
@@ -1019,6 +1019,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
@@ -1431,7 +1431,7 @@ spec:
  failureThreshold: 3
  httpGet:
  path: /healthz
- port: 6060
+ port: healthz
  initialDelaySeconds: 90
  periodSeconds: 60
  timeoutSeconds: 30
@@ -1440,6 +1440,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
@@ -1520,7 +1520,7 @@ spec:
  failureThreshold: 3
  httpGet:
  path: /healthz
- port: 6060
+ port: healthz
  initialDelaySeconds: 90
  periodSeconds: 60
  timeoutSeconds: 30
@@ -1529,6 +1529,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
@@ -1512,7 +1512,7 @@ spec:
  failureThreshold: 3
  httpGet:
  path: /healthz
- port: 6060
+ port: healthz
  initialDelaySeconds: 90
  periodSeconds: 60
  timeoutSeconds: 30
@@ -1521,6 +1521,11 @@ spec:
  - containerPort: 9090
  name: metrics
  - containerPort: 6060
+ name: healthz
+ readinessProbe:
+ httpGet:
+ path: /metrics
+ port: metrics
  securityContext:
  allowPrivilegeEscalation: false
  capabilities: