linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(helm): eliminate stray whitespace (#13827)

This commit is contained in:
Oliver Gould 2025-03-19 11:34:21 -07:00 committed by GitHub
parent aaa52704f8
commit 2aea89dd07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 8 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2-cni/templates/cni-plugin.yaml
View File

@ -199,7 +199,7 @@ spec:
selector:
matchLabels:
k8s-app: linkerd-cni
updateStrategy: {{ .Values.updateStrategy | toYaml | nindent 4 }}
updateStrategy:{{ .Values.updateStrategy | toYaml | nindent 4 }}
template:
metadata:
labels:

6
charts/partials/templates/_proxy.tpl
View File

@ -25,15 +25,15 @@ env:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
{{/* Configure CPU cores usage */}}
{{/* 1. Fixed configuration (DEPRECATED) */}}
{{/* Configure CPU cores usage */ -}}
{{/* 1. Fixed configuration (DEPRECATED) */ -}}
{{ if .Values.proxy.cores -}}
- name: LINKERD2_PROXY_CORES
value: {{ .Values.proxy.cores | quote }}
- name: LINKERD2_PROXY_CORES_MIN
value: {{ .Values.proxy.cores | quote }}
{{ else -}}
{{/* 2. Variable configuration */}}
{{/* 2. Variable configuration */ -}}
{{ with (.Values.proxy.runtime).workers -}}
- name: LINKERD2_PROXY_CORES
value: {{ .minimum | default 1 | quote }}

2
cli/cmd/testdata/install-cni-plugin_fully_configured.golden generated vendored
View File

@ -92,9 +92,9 @@ spec:
matchLabels:
k8s-app: linkerd-cni
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:

2
cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden generated vendored
View File

@ -92,9 +92,9 @@ spec:
matchLabels:
k8s-app: linkerd-cni
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:

2
cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden generated vendored
View File

@ -92,9 +92,9 @@ spec:
matchLabels:
k8s-app: linkerd-cni
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:

2
cli/cmd/testdata/install_cni_helm_override_output.golden generated vendored
View File

@ -85,9 +85,9 @@ spec:
matchLabels:
k8s-app: linkerd-cni
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:

9
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -1015,9 +1015,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1399,9 +1396,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1921,9 +1915,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1389,9 +1386,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1901,9 +1895,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_gid_output.golden generated vendored
View File

@ -1015,9 +1015,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1402,9 +1399,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1930,9 +1924,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -1091,9 +1091,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1520,9 +1517,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2082,9 +2076,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -1091,9 +1091,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1520,9 +1517,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2082,9 +2076,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -945,9 +945,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1329,9 +1326,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1766,9 +1760,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -987,9 +987,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1373,9 +1370,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1898,9 +1892,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -1064,9 +1064,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1495,9 +1492,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2061,9 +2055,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden generated vendored
View File

@ -1065,9 +1065,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1499,9 +1496,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2072,9 +2066,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -1072,9 +1072,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1507,9 +1504,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2081,9 +2075,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -1054,9 +1054,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1485,9 +1482,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -2051,9 +2045,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1391,9 +1388,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1905,9 +1899,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -966,9 +966,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED
@ -1343,9 +1340,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED
value: "false"
- name: LINKERD2_PROXY_LOG
@ -1866,9 +1860,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED
value: "false"
- name: LINKERD2_PROXY_LOG

9
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN

9
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -1014,9 +1014,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1398,9 +1395,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN
@ -1919,9 +1913,6 @@ spec:
fieldPath: spec.nodeName
- name: _pod_containerName
value: &containerName linkerd-proxy
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_CORES_MIN