From 6f7d3a4425edfa45a8bd68764c6a00991cccc424 Mon Sep 17 00:00:00 2001 From: kristjankullerkann-wearemp <159039371+kristjankullerkann-wearemp@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:26:57 +0300 Subject: [PATCH] Add support to modify liveness and readiness probe timeouts on control plane containers (#13002) Signed-off-by: Kristjan Kullerkann --- .../templates/destination.yaml | 18 +++++++++++++ .../templates/identity.yaml | 6 +++++ .../templates/proxy-injector.yaml | 6 +++++ charts/linkerd-control-plane/values.yaml | 26 +++++++++++++++++++ cli/cmd/install_test.go | 1 + ...install_controlplane_tracing_output.golden | 14 +++++++++- cli/cmd/testdata/install_custom_domain.golden | 14 +++++++++- .../testdata/install_custom_registry.golden | 14 +++++++++- cli/cmd/testdata/install_default.golden | 14 +++++++++- ...stall_default_override_dst_get_nets.golden | 14 +++++++++- cli/cmd/testdata/install_default_token.golden | 14 +++++++++- cli/cmd/testdata/install_gid_output.golden | 14 +++++++++- cli/cmd/testdata/install_ha_output.golden | 14 +++++++++- .../install_ha_with_overrides_output.golden | 14 +++++++++- .../install_heartbeat_disabled_output.golden | 14 +++++++++- .../install_helm_control_plane_output.golden | 14 +++++++++- ...nstall_helm_control_plane_output_ha.golden | 14 +++++++++- ...lm_control_plane_output_ha_with_gid.golden | 14 +++++++++- .../install_helm_output_ha_labels.golden | 14 +++++++++- ...l_helm_output_ha_namespace_selector.golden | 14 +++++++++- .../testdata/install_no_init_container.golden | 14 +++++++++- cli/cmd/testdata/install_output.golden | 4 +-- cli/cmd/testdata/install_proxy_ignores.golden | 14 +++++++++- cli/cmd/testdata/install_values_file.golden | 14 +++++++++- pkg/charts/linkerd2/values_test.go | 6 +++++ 25 files changed, 299 insertions(+), 20 deletions(-) diff --git a/charts/linkerd-control-plane/templates/destination.yaml b/charts/linkerd-control-plane/templates/destination.yaml index b214c3c648cd0..4be0d21abc4d1 100644 --- a/charts/linkerd-control-plane/templates/destination.yaml +++ b/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 }} diff --git a/charts/linkerd-control-plane/templates/identity.yaml b/charts/linkerd-control-plane/templates/identity.yaml index bd3bcbe310546..8ed15e630ba2e 100644 --- a/charts/linkerd-control-plane/templates/identity.yaml +++ b/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 }} diff --git a/charts/linkerd-control-plane/templates/proxy-injector.yaml b/charts/linkerd-control-plane/templates/proxy-injector.yaml index 0f6b3bb875c99..34b1d3ba42cc9 100644 --- a/charts/linkerd-control-plane/templates/proxy-injector.yaml +++ b/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 }} diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index 7889c040572fc..c51a4eb5a1dde 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/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: diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go index 7d06da27f8f2d..2f1e1bd023270 100644 --- a/cli/cmd/install_test.go +++ b/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", diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index ab1bdd0861fa5..25bd1c2d5c5ee 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1490,6 +1498,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1501,6 +1510,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1523,6 +1533,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1534,6 +1545,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index a6155034c3f51..698083d907924 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 0283388a3aa68..7b4b6981cc559 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index a6155034c3f51..698083d907924 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index dec936b3c1cec..2693d941f14e9 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index dc9aad80ee366..57e48992f6a82 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1477,6 +1485,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1488,6 +1497,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1510,6 +1520,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1521,6 +1532,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index dcc89dd491659..15f0861498fdb 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1493,6 +1501,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1504,6 +1513,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1527,6 +1537,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1538,6 +1549,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 1c064fe8b7878..5fdbc4c1f5d7d 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -811,7 +815,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Fail --- @@ -1615,6 +1623,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1626,6 +1635,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1654,6 +1664,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1665,6 +1676,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 3c13ef9c2c109..109f3213a8be4 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -811,7 +815,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Fail --- @@ -1615,6 +1623,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1626,6 +1635,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1654,6 +1664,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1665,6 +1676,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 67a31183839dc..2240ac0c101f3 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -450,6 +450,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -457,6 +459,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: true @@ -706,7 +710,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1419,6 +1427,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1430,6 +1439,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1452,6 +1462,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1463,6 +1474,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 7025eedaaafc6..182a93e34c20d 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -520,6 +520,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -527,6 +529,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -752,7 +756,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tap: caBundle: test-tap-ca-bundle externalSecret: true @@ -1463,6 +1471,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1474,6 +1483,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1496,6 +1506,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1507,6 +1518,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index 0ebd926950586..2615b4401e1f5 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -520,6 +520,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -527,6 +529,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -788,7 +792,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tap: caBundle: test-tap-ca-bundle externalSecret: true @@ -1590,6 +1598,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1601,6 +1610,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1629,6 +1639,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1640,6 +1651,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index 40e261f23b36c..ea6e80ece0502 100755 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden @@ -520,6 +520,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -527,6 +529,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -788,7 +792,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tap: caBundle: test-tap-ca-bundle externalSecret: true @@ -1595,6 +1603,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1606,6 +1615,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1635,6 +1645,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1646,6 +1657,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 0652e150cd4c8..40a36dc46092e 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -520,6 +520,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -527,6 +529,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -792,7 +796,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tap: caBundle: test-tap-ca-bundle externalSecret: true @@ -1602,6 +1610,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1613,6 +1622,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1641,6 +1651,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1652,6 +1663,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index 27cfe2cea184f..50d1299b81238 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -515,6 +515,8 @@ data: maxSurge: 25% maxUnavailable: 1 destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -522,6 +524,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: cpu: @@ -778,7 +782,11 @@ data: limit: 250Mi request: 50Mi revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tap: caBundle: test-tap-ca-bundle externalSecret: true @@ -1580,6 +1588,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1591,6 +1600,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 resources: limits: memory: "250Mi" @@ -1619,6 +1629,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1630,6 +1641,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index acfbce9746878..2906515f1d2b1 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1481,6 +1489,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1492,6 +1501,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1514,6 +1524,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1525,6 +1536,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 2abbe3ada929f..65e20c577f0fb 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -509,7 +509,7 @@ data: name: DebugImageName pullPolicy: DebugImagePullPolicy version: DebugVersion - destinationController: null + destinationController: {} destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -1995,7 +1995,7 @@ spec: --- apiVersion: v1 data: - linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJHSUQ6IDIxMDMKY29udHJvbGxlckltYWdlOiBDb250cm9sbGVySW1hZ2UKY29udHJvbGxlckxvZ0Zvcm1hdDogQ29udHJvbGxlckxvZ0Zvcm1hdApjb250cm9sbGVyTG9nTGV2ZWw6IENvbnRyb2xsZXJMb2dMZXZlbApkZWJ1Z0NvbnRhaW5lcjoKICBpbWFnZToKICAgIG5hbWU6IERlYnVnSW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBEZWJ1Z0ltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogRGVidWdWZXJzaW9uCmRlc3RpbmF0aW9uQ29udHJvbGxlcjogbnVsbApkaXNhYmxlSVB2NjogZmFsc2UKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGNvbm5lY3RBZGRyOiAxLjEuMS4xOjIwMDAxCiAgZW5hYmxlU2VjdXJpdHlDb250ZXh0OiBmYWxzZQogIGxpc3RlbkFkZHI6ICdbOjpdOjQxNDAnCnBvZE1vbml0b3I6IG51bGwKcG9saWN5Q29udHJvbGxlcjoKICBpbWFnZToKICAgIG5hbWU6IFBvbGljeUNvbnRyb2xsZXJJbWFnZU5hbWUKICAgIHB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogUG9saWN5Q29udHJvbGxlclZlcnNpb24KICBsb2dMZXZlbDogbG9nLWxldmVsCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogY3B1LWxpbWl0CiAgICAgIHJlcXVlc3Q6IGNwdS1yZXF1ZXN0CiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiBtZW1vcnktbGltaXQKICAgICAgcmVxdWVzdDogbWVtb3J5LXJlcXVlc3QKcG9saWN5VmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwb2xpY3kgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByaW9yaXR5Q2xhc3NOYW1lOiBQcmlvcml0eUNsYXNzTmFtZQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm94eToKICBjb250cm9sOiBudWxsCiAgZGVmYXVsdEluYm91bmRQb2xpY3k6IGRlZmF1bHQtYWxsb3ctcG9saWN5CiAgZ2lkOiAyMTAyCiAgaW1hZ2U6CiAgICBuYW1lOiBQcm94eUltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQcm94eVZlcnNpb24KICBpbmJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgaW5ib3VuZERpc2NvdmVyeUNhY2hlVW51c2VkVGltZW91dDogIiIKICBsb2dMZXZlbDogd2FybixsaW5rZXJkPWluZm8KICBvcGFxdWVQb3J0czogMjUsNDQzLDU4NywzMzA2LDU0MzIsMTEyMTEKICBvdXRib3VuZENvbm5lY3RUaW1lb3V0OiAiIgogIG91dGJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6IGNwdS1saW1pdAogICAgICByZXF1ZXN0OiBjcHUtcmVxdWVzdAogICAgbWVtb3J5OgogICAgICBsaW1pdDogbWVtb3J5LWxpbWl0CiAgICAgIHJlcXVlc3Q6IG1lbW9yeS1yZXF1ZXN0CiAgc3RhcnR1cFByb2JlOiBudWxsCnByb3h5Q29udGFpbmVyTmFtZTogUHJveHlDb250YWluZXJOYW1lCnByb3h5SW5pdDoKICBpZ25vcmVJbmJvdW5kUG9ydHM6ICIiCiAgaWdub3JlT3V0Ym91bmRQb3J0czogIjQ0MyIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW5pdEltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQcm94eUluaXRWZXJzaW9uCiAga3ViZUFQSVNlcnZlclBvcnRzOiAiIgpwcm94eUluamVjdG9yOgogIGNhQnVuZGxlOiBwcm94eSBpbmplY3RvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQp3ZWJob29rRmFpbHVyZVBvbGljeTogV2ViaG9va0ZhaWx1cmVQb2xpY3kK + linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJHSUQ6IDIxMDMKY29udHJvbGxlckltYWdlOiBDb250cm9sbGVySW1hZ2UKY29udHJvbGxlckxvZ0Zvcm1hdDogQ29udHJvbGxlckxvZ0Zvcm1hdApjb250cm9sbGVyTG9nTGV2ZWw6IENvbnRyb2xsZXJMb2dMZXZlbApkZWJ1Z0NvbnRhaW5lcjoKICBpbWFnZToKICAgIG5hbWU6IERlYnVnSW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBEZWJ1Z0ltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogRGVidWdWZXJzaW9uCmRpc2FibGVJUHY2OiBmYWxzZQplbmFibGVFbmRwb2ludFNsaWNlczogZmFsc2UKaGVhcnRiZWF0U2NoZWR1bGU6IDEgMiAzIDQgNQppZGVudGl0eToKICBpc3N1ZXI6CiAgICB0bHM6CiAgICAgIGNydFBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogICAgICAgIE1JSUJ3RENDQVdlZ0F3SUJBZ0lSQUpSSWdaOFJ0TzhFd2cxWGVwZjhUNDR3Q2dZSUtvWkl6ajBFQXdJd0tURW4KICAgICAgICBNQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUI0WERUSXdNRGd5CiAgICAgICAgT0RBM01UTTBOMW9YRFRNd01EZ3lOakEzTVRNME4xb3dLVEVuTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdQogICAgICAgIGEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTEvRnAKICAgICAgICBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzJkUXZSYVlhbnV4RDM2RHQxCiAgICAgICAgMi9KeHlpU2d4S1dSZG9heSthTndNRzR3RGdZRFZSMFBBUUgvQkFRREFnRUdNQklHQTFVZEV3RUIvd1FJTUFZQgogICAgICAgIEFmOENBUUF3SFFZRFZSME9CQllFRkkxV25ycU1ZS2FISE9vK3pweWlpRHEycE8wS01Da0dBMVVkRVFRaU1DQ0MKICAgICAgICBIbWxrWlc1MGFYUjVMbXhwYm10bGNtUXVZMngxYzNSbGNpNXNiMk5oYkRBS0JnZ3Foa2pPUFFRREFnTkhBREJFCiAgICAgICAgQWlBdHVvSTVYdUN0ckdWUnpTbVJUbDJyYTI4YVY5TXlUVTdkNXFuVEFGSEtTZ0lnUktDdmx1T1NnQTVPMjFwNQogICAgICAgIDUxdGRybWtIRVpScjBxbExTSmRIWWdFZk16az0KICAgICAgICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCiAgICAgIGtleVBFTTogfAogICAgICAgIC0tLS0tQkVHSU4gRUMgUFJJVkFURSBLRVktLS0tLQogICAgICAgIE1IY0NBUUVFSUFBZThuZmJ6WnU5Yy9PQjIrOHhKTTBGejdOVXdUUWF6dWxrRk5zNFRJNStvQW9HQ0NxR1NNNDkKICAgICAgICBBd0VIb1VRRFFnQUUxL0ZwZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyCiAgICAgICAgZFF2UmFZYW51eEQzNkR0MTIvSnh5aVNneEtXUmRvYXkrUT09CiAgICAgICAgLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQppZGVudGl0eVRydXN0QW5jaG9yc1BFTTogfAogIC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQogIE1JSUJ3VENDQVdhZ0F3SUJBZ0lRZURacDVsRGFJeWdRNVVmTUtackZBVEFLQmdncWhrak9QUVFEQWpBcE1TY3cKICBKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3SGhjTk1qQXdPREk0CiAgTURjeE1qUTNXaGNOTXpBd09ESTJNRGN4TWpRM1dqQXBNU2N3SlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1cgogIFpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFScWM3MFoKICBsMXZndzc5cmpCNXVTSVRJQ1VBNkd5ZnZTRmZjdUlpczdCL1hGU2trd0FIVTVTL3MxQUFQK1IwVFg3SEJXVUM0CiAgdWFHNFdXc2l3SktObjdtZ28zQXdiakFPQmdOVkhROEJBZjhFQkFNQ0FRWXdFZ1lEVlIwVEFRSC9CQWd3QmdFQgogIC93SUJBVEFkQmdOVkhRNEVGZ1FVNVl0alZWUGZkN0k3TkxIc24yQzI2RUJ5R1Ywd0tRWURWUjBSQkNJd0lJSWUKICBhV1JsYm5ScGRIa3ViR2x1YTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUFvR0NDcUdTTTQ5QkFNQ0Ewa0FNRVlDCiAgSVFDTjdsQkZMRER2ang2VjArWGtqcEtFUlJzSllmNWFkTXZubG9GbDQ4aWxKZ0loQU50eGhuZGNyK1FKUHVDOAogIHZnVUMwZDIvOUZNdWVJVk1iKzQ2V1RDT2pzcXIKICAtLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCmltYWdlUHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CmltYWdlUHVsbFNlY3JldHM6IG51bGwKbGlua2VyZFZlcnNpb246IExpbmtlcmRWZXJzaW9uCm5ldHdvcmtWYWxpZGF0b3I6CiAgY29ubmVjdEFkZHI6IDEuMS4xLjE6MjAwMDEKICBlbmFibGVTZWN1cml0eUNvbnRleHQ6IGZhbHNlCiAgbGlzdGVuQWRkcjogJ1s6Ol06NDE0MCcKcG9kTW9uaXRvcjogbnVsbApwb2xpY3lDb250cm9sbGVyOgogIGltYWdlOgogICAgbmFtZTogUG9saWN5Q29udHJvbGxlckltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQb2xpY3lDb250cm9sbGVyVmVyc2lvbgogIGxvZ0xldmVsOiBsb2ctbGV2ZWwKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdApwb2xpY3lWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHBvbGljeSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJpb3JpdHlDbGFzc05hbWU6IFByaW9yaXR5Q2xhc3NOYW1lCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByb3h5OgogIGNvbnRyb2w6IG51bGwKICBkZWZhdWx0SW5ib3VuZFBvbGljeTogZGVmYXVsdC1hbGxvdy1wb2xpY3kKICBnaWQ6IDIxMDIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5VmVyc2lvbgogIGluYm91bmRDb25uZWN0VGltZW91dDogIiIKICBpbmJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIGxvZ0xldmVsOiB3YXJuLGxpbmtlcmQ9aW5mbwogIG9wYXF1ZVBvcnRzOiAyNSw0NDMsNTg3LDMzMDYsNTQzMiwxMTIxMQogIG91dGJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogY3B1LWxpbWl0CiAgICAgIHJlcXVlc3Q6IGNwdS1yZXF1ZXN0CiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiBtZW1vcnktbGltaXQKICAgICAgcmVxdWVzdDogbWVtb3J5LXJlcXVlc3QKICBzdGFydHVwUHJvYmU6IG51bGwKcHJveHlDb250YWluZXJOYW1lOiBQcm94eUNvbnRhaW5lck5hbWUKcHJveHlJbml0OgogIGlnbm9yZUluYm91bmRQb3J0czogIiIKICBpZ25vcmVPdXRib3VuZFBvcnRzOiAiNDQzIgogIGltYWdlOgogICAgbmFtZTogUHJveHlJbml0SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5SW5pdFZlcnNpb24KICBrdWJlQVBJU2VydmVyUG9ydHM6ICIiCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnNwVmFsaWRhdG9yOiBudWxsCndlYmhvb2tGYWlsdXJlUG9saWN5OiBXZWJob29rRmFpbHVyZVBvbGljeQo= kind: Secret metadata: creationTimestamp: null diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 74e1ebc27e27f..da8e809602e67 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 146789a870cdf..80cc0a2339660 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -519,6 +519,8 @@ data: maxSurge: 25% maxUnavailable: 25% destinationController: + livenessProbe: + timeoutSeconds: 1 meshedHttp2ClientProtobuf: keep_alive: interval: @@ -526,6 +528,8 @@ data: timeout: seconds: 3 while_idle: true + readinessProbe: + timeoutSeconds: 1 destinationProxyResources: null destinationResources: null disableHeartBeat: false @@ -775,7 +779,11 @@ data: proxyInjectorProxyResources: null proxyInjectorResources: null revisionHistoryLimit: 10 - spValidator: null + spValidator: + livenessProbe: + timeoutSeconds: 1 + readinessProbe: + timeoutSeconds: 1 tolerations: null webhookFailurePolicy: Ignore --- @@ -1488,6 +1496,7 @@ spec: path: /ping port: 9996 initialDelaySeconds: 10 + timeoutSeconds: 1 name: destination ports: - containerPort: 8086 @@ -1499,6 +1508,7 @@ spec: httpGet: path: /ready port: 9996 + timeoutSeconds: 1 securityContext: capabilities: drop: @@ -1521,6 +1531,7 @@ spec: path: /ping port: 9997 initialDelaySeconds: 10 + timeoutSeconds: 1 name: sp-validator ports: - containerPort: 8443 @@ -1532,6 +1543,7 @@ spec: httpGet: path: /ready port: 9997 + timeoutSeconds: 1 securityContext: capabilities: drop: diff --git a/pkg/charts/linkerd2/values_test.go b/pkg/charts/linkerd2/values_test.go index ac239ea37fe50..4ac0e8506f02b 100644 --- a/pkg/charts/linkerd2/values_test.go +++ b/pkg/charts/linkerd2/values_test.go @@ -98,6 +98,12 @@ func TestNewValues(t *testing.T) { "while_idle": true, }, }, + "livenessProbe": map[string]interface{}{"timeoutSeconds": 1.0}, + "readinessProbe": map[string]interface{}{"timeoutSeconds": 1.0}, + }, + SPValidator: map[string]interface{}{ + "livenessProbe": map[string]interface{}{"timeoutSeconds": 1.0}, + "readinessProbe": map[string]interface{}{"timeoutSeconds": 1.0}, }, PolicyController: &PolicyController{ Image: &Image{