Merge branch 'master' into master

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.3
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.6.8
+version: 3.6.9
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argo-cd/values.yaml

@@ -567,7 +567,7 @@ server:
       # - path: /*
       #   pathType: Prefix
       #   backend:
-      #     service
+      #     service:
       #       name: ssl-redirect
       #       port:
       #         name: use-annotation
@@ -604,7 +604,7 @@ server:
       # - path: /*
       #   pathType: Prefix
       #   backend:
-      #     service
+      #     service:
       #       name: ssl-redirect
       #       port:
       #         name: use-annotation

charts/argo-workflows/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.2.5
+version: 0.2.6
-appVersion: "v3.0.2"
+appVersion: "v3.0.7"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 sources:

charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml

@@ -77,12 +77,8 @@ spec:
           ports:
             - name: metrics
               containerPort: {{ .Values.controller.metricsConfig.port }}
-          livenessProbe:
+            - containerPort: 6060
-            httpGet:
+          livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
-              port: metrics
-              path: {{ .Values.controller.metricsConfig.path }}
-            initialDelaySeconds: 30
-            periodSeconds: 30
       {{- with .Values.images.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

charts/argo-workflows/values.yaml

@@ -132,6 +132,15 @@ controller:
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
   resources: {}
+  livenessProbe:
+    httpGet:
+      port: 6060
+      path: /healthz
+    # Require three failures to tolerate transient errors.
+    failureThreshold: 3
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    timeoutSeconds: 30
 
   ## Extra environment variables to provide to the controller container
   ## extraEnv: