Add support to modify liveness and readiness probe timeouts on contro…

…l plane containers (#13002)

Signed-off-by: Kristjan Kullerkann <[email protected]>

charts/linkerd-control-plane/templates/destination.yaml

@@ -235,6 +235,9 @@ spec:
             path: /ping
             port: 9996
           initialDelaySeconds: 10
+          {{- with (.Values.destinationController.livenessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         name: destination
         ports:
         - containerPort: 8086
@@ -246,6 +249,9 @@ spec:
           httpGet:
             path: /ready
             port: 9996
+          {{- with (.Values.destinationController.readinessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         {{- if .Values.destinationResources -}}
         {{- include "partials.resources" .Values.destinationResources | nindent 8 }}
         {{- end }}
@@ -283,6 +289,9 @@ spec:
             path: /ping
             port: 9997
           initialDelaySeconds: 10
+          {{- with ((.Values.spValidator).livenessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         name: sp-validator
         ports:
         - containerPort: 8443
@@ -294,6 +303,9 @@ spec:
           httpGet:
             path: /ready
             port: 9997
+          {{- with ((.Values.spValidator).readinessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         {{- if .Values.spValidatorResources -}}
         {{- include "partials.resources" .Values.spValidatorResources | nindent 8 }}
         {{- end }}
@@ -343,6 +355,9 @@ spec:
           httpGet:
             path: /live
             port: admin-http
+          {{- with (.Values.policyController.livenessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         name: policy
         ports:
         - containerPort: 8090
@@ -357,6 +372,9 @@ spec:
             path: /ready
             port: admin-http
           initialDelaySeconds: 10
+          {{- with (.Values.policyController.readinessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         {{- if .Values.policyController.resources }}
         {{- include "partials.resources" .Values.policyController.resources | nindent 8 }}
         {{- end }}

charts/linkerd-control-plane/templates/identity.yaml

@@ -185,6 +185,9 @@ spec:
             path: /ping
             port: 9990
           initialDelaySeconds: 10
+          {{- with (.Values.identity.livenessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         name: identity
         ports:
         - containerPort: 8080
@@ -196,6 +199,9 @@ spec:
           httpGet:
             path: /ready
             port: 9990
+          {{- with (.Values.identity.readinessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         {{- if .Values.identityResources -}}
         {{- include "partials.resources" .Values.identityResources | nindent 8 }}
         {{- end }}

charts/linkerd-control-plane/templates/proxy-injector.yaml

@@ -98,6 +98,9 @@ spec:
             path: /ping
             port: 9995
           initialDelaySeconds: 10
+          {{- with (.Values.proxyInjector.livenessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         name: proxy-injector
         ports:
         - containerPort: 8443
@@ -109,6 +112,9 @@ spec:
           httpGet:
             path: /ready
             port: 9995
+          {{- with (.Values.proxyInjector.readinessProbe).timeoutSeconds }}
+          timeoutSeconds: {{ . }}
+          {{- end }}
         {{- if .Values.proxyInjectorResources -}}
         {{- include "partials.resources" .Values.proxyInjectorResources | nindent 8 }}
         {{- end }}

charts/linkerd-control-plane/values.yaml

@@ -118,6 +118,11 @@ policyController:
       # -- Amount of ephemeral storage that the policy controller requests
       request: ""
 
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
+
 # proxy configuration
 proxy:
   # -- Enable service profiles for non-Kubernetes services
@@ -379,6 +384,10 @@ destinationController:
       timeout:
         seconds: 3
       while_idle: true
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
 
 # debug configuration
 debugContainer:
@@ -419,6 +428,11 @@ identity:
 
   kubeAPI: *kubeapi
 
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
+
 # -|- CPU, Memory and Ephemeral Storage resources required by the identity controller (see `proxy.resources` for sub-fields)
 #identityResources:
 # -|- CPU, Memory and Ephemeral Storage resources required by proxy injected into identity pod (see `proxy.resources` for sub-fields)
@@ -491,6 +505,11 @@ proxyInjector:
   # for more information.
   injectCaFromSecret: ""
 
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
+
 # -|- CPU, Memory and Ephemeral Storage resources required by the proxy injector (see
 #`proxy.resources` for sub-fields)
 #proxyInjectorResources:
@@ -594,6 +613,13 @@ policyValidator:
 nodeSelector:
   kubernetes.io/os: linux
 
+# -- SP validator configuration
+spValidator:
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
+
 # -|- CPU, Memory and Ephemeral Storage resources required by the SP validator (see
 #`proxy.resources` for sub-fields)
 #spValidatorResources:

cli/cmd/install_test.go

@@ -60,6 +60,7 @@ func TestRender(t *testing.T) {
 		CNIEnabled:              false,
 		IdentityTrustDomain:     defaultValues.IdentityTrustDomain,
 		IdentityTrustAnchorsPEM: defaultValues.IdentityTrustAnchorsPEM,
+		DestinationController:   map[string]any{},
 		PodAnnotations:          map[string]string{},
 		PodLabels:               map[string]string{},
 		PriorityClassName:       "PriorityClassName",