fix(velero): do not set default probes

Signed-off-by: Maxime Leroy <19607336+maxime1907@users.noreply.github.com>
vmware-tanzu · Jun 30, 2023 · 494688c · 494688c
1 parent 90450f6
commit 494688c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.11.0
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart for velero
 name: velero
-version: 4.1.0
+version: 4.1.1
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -154,12 +154,14 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if .Values.metrics.enabled }}
           {{- with .Values.livenessProbe }}
           livenessProbe: {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- with .Values.readinessProbe }}
           readinessProbe: {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- end }}
           {{- with .Values.containerSecurityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -90,28 +90,28 @@ priorityClassName: ""
 terminationGracePeriodSeconds: 3600
 
 # Liveness probe of the pod
-livenessProbe:
-  httpGet:
-    path: /metrics
-    port: http-monitoring
-    scheme: HTTP
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  timeoutSeconds: 5
-  successThreshold: 1
-  failureThreshold: 5
+livenessProbe: {}
+  # httpGet:
+  #   path: /metrics
+  #   port: http-monitoring
+  #   scheme: HTTP
+  # initialDelaySeconds: 10
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # successThreshold: 1
+  # failureThreshold: 5
 
 # Readiness probe of the pod
-readinessProbe:
-  httpGet:
-    path: /metrics
-    port: http-monitoring
-    scheme: HTTP
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  timeoutSeconds: 5
-  successThreshold: 1
-  failureThreshold: 5
+readinessProbe: {}
+  # httpGet:
+  #   path: /metrics
+  #   port: http-monitoring
+  #   scheme: HTTP
+  # initialDelaySeconds: 10
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # successThreshold: 1
+  # failureThreshold: 5
 
 # Tolerations to use for the Velero deployment. Optional.
 tolerations: []