Remove templated tls.enabled in probe

akuity · Dec 4, 2024 · 63890e6 · 63890e6
1 parent 01408d7
commit 63890e6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/charts/kargo/templates/api/deployment.yaml b/charts/kargo/templates/api/deployment.yaml
@@ -90,25 +90,9 @@ spec:
           {{- with .Values.api.probes.livenessProbe }}
           livenessProbe: {{- toYaml . | nindent 12 }}
           {{- end }}
-            exec:
-              command:
-                - /usr/local/bin/grpc_health_probe
-                - -addr=:8080
-{{- if .Values.api.tls.enabled }}
-                - -tls
-                - -tls-no-verify
-{{- end }}
           {{- with .Values.api.probes.readinessProbe }}
           readinessProbe: {{- toYaml . | nindent 12 }}
           {{- end }}
-            exec:
-              command:
-                - /usr/local/bin/grpc_health_probe
-                - -addr=:8080
-{{- if .Values.api.tls.enabled }}
-                - -tls
-                - -tls-no-verify
-{{- end }}
 {{- end }}
 {{- if or .Values.kubeconfigSecrets.kargo (and .Values.api.oidc.enabled .Values.api.oidc.dex.enabled) .Values.api.tls.enabled .Values.api.cabundle.configMapName .Values.api.cabundle.secretName }}
           volumeMounts:

diff --git a/charts/kargo/values.yaml b/charts/kargo/values.yaml
@@ -146,9 +146,22 @@ api:
     enabled: true
     livenessProbe:
       initialDelaySeconds: 10
-
+      exec:
+        command:
+          - /usr/local/bin/grpc_health_probe
+          - -addr=:8080
+          # Manually disable if TLS is not used
+          - -tls
+          - -tls-no-verify
     readinessProbe:
       initialDelaySeconds: 5
+      exec:
+        command:
+          - /usr/local/bin/grpc_health_probe
+          - -addr=:8080
+          # Manually disable if TLS is not used
+          - -tls
+          - -tls-no-verify
 
   tls:
     ## @param api.tls.enabled Whether to enable TLS directly on the API server. This is helpful if you do not intend to use an ingress controller or if you require TLS end-to-end. All other settings in this section will be ignored when this is set to `false`.