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

Enable TLS detection on port 443 (#6887) 

We've previously handled inbound connections on 443 as opaque, meaning
that we don't do any TLS detection.

This prevents the proxy from reporting meaningful metadata on these TLS
connections--especially the connection's SNI value.

This change also simplifies the core control plane's configuration for
skipping outbound connection on 443 to be much simpler (and
documented!).
This commit is contained in:
Oliver Gould 2021-09-15 16:55:28 -07:00 committed by GitHub
parent 9528456ebd
commit 99d5819232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 167 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2/README.md
View File

@ -191,7 +191,7 @@ Kubernetes: `>=1.16.0-0`
| proxy.inboundConnectTimeout | string | `"100ms"` | Maximum time allowed for the proxy to establish an inbound TCP connection |
| proxy.logFormat | string | `"plain"` | Log format (`plain` or `json`) for the proxy |
| proxy.logLevel | string | `"warn,linkerd=info"` | Log level for the proxy |
| proxy.opaquePorts | string | `"25,443,587,3306,4444,5432,6379,9300,11211"` | Default set of opaque ports - SMTP (25,587) server-first - HTTPS (443) opaque TLS - MYSQL (3306) server-first - Galera (4444) server-first - PostgreSQL (5432) server-first - Redis (6379) server-first - ElasticSearch (9300) server-first - Memcached (11211) clients do not issue any preamble, which breaks detection |
| proxy.opaquePorts | string | `"25,587,3306,4444,5432,6379,9300,11211"` | Default set of opaque ports - SMTP (25,587) server-first - MYSQL (3306) server-first - Galera (4444) server-first - PostgreSQL (5432) server-first - Redis (6379) server-first - ElasticSearch (9300) server-first - Memcached (11211) clients do not issue any preamble, which breaks detection |
| proxy.outboundConnectTimeout | string | `"1000ms"` | Maximum time allowed for the proxy to establish an outbound TCP connection |
| proxy.ports.admin | int | `4191` | Admin port for the proxy container |
| proxy.ports.control | int | `4190` | Control port for the proxy container |

9
charts/linkerd2/templates/destination.yaml
View File

@ -151,7 +151,6 @@ spec:
{{ include "partials.annotations.created-by" . }}
{{- include "partials.proxy.annotations" . | nindent 8}}
{{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }}
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -289,9 +288,11 @@ spec:
readOnly: true
{{ if not .Values.cniEnabled -}}
initContainers:
{{- if not (contains "443" ( .Values.proxyInit.ignoreOutboundPorts | toString ))}}
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" ( ternary "443" (printf "%s,443" (.Values.proxyInit.ignoreOutboundPorts | toString )) (empty .Values.proxyInit.ignoreOutboundPorts)) -}}
{{- end}}
{{- /*
The destination controller needs to connect to the Kubernetes API before the proxy is able
to proxy requests, so we always skip these connections.
*/}}
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" "443" }}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
serviceAccountName: linkerd-destination

9
charts/linkerd2/templates/identity.yaml
View File

@ -201,9 +201,12 @@ spec:
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ if not .Values.cniEnabled -}}
initContainers:
{{- if not (contains "443" ( .Values.proxyInit.ignoreOutboundPorts | toString ))}}
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" ( ternary "443" (printf "%s,443" (.Values.proxyInit.ignoreOutboundPorts | toString )) (empty .Values.proxyInit.ignoreOutboundPorts)) -}}
{{- end}}
{{- /*
The identity controller needs to connect to the Kubernetes API before the proxy is able to
proxy requests, so we always skip these connections. The identity controller makes no other
outbound connections (so it's not important to persist any other skip ports here)
*/}}
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" "443" }}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
serviceAccountName: linkerd-identity

3
charts/linkerd2/templates/proxy-injector.yaml
View File

@ -106,9 +106,6 @@ spec:
readOnly: true
{{ if not .Values.cniEnabled -}}
initContainers:
{{- if not (contains "443" ( .Values.proxyInit.ignoreOutboundPorts | toString ))}}
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" ( ternary "443" (printf "%s,443" (.Values.proxyInit.ignoreOutboundPorts | toString )) (empty .Values.proxyInit.ignoreOutboundPorts)) -}}
{{- end}}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
serviceAccountName: linkerd-proxy-injector

3
charts/linkerd2/values.yaml
View File

@ -139,14 +139,13 @@ proxy:
requireIdentityOnInboundPorts: ""
# -- Default set of opaque ports
# - SMTP (25,587) server-first
# - HTTPS (443) opaque TLS
# - MYSQL (3306) server-first
# - Galera (4444) server-first
# - PostgreSQL (5432) server-first
# - Redis (6379) server-first
# - ElasticSearch (9300) server-first
# - Memcached (11211) clients do not issue any preamble, which breaks detection
opaquePorts: "25,443,587,3306,4444,5432,6379,9300,11211"
opaquePorts: "25,587,3306,4444,5432,6379,9300,11211"
# proxy-init configuration
proxyInit:

2
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml vendored
View File

@ -73,7 +73,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml vendored
View File

@ -73,7 +73,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -267,7 +267,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml vendored
View File

@ -73,7 +73,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_contour.golden.yml generated vendored
View File

@ -81,7 +81,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

8
cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -280,7 +280,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -485,7 +485,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -690,7 +690,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml generated vendored
View File

@ -85,7 +85,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

4
cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -280,7 +280,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml generated vendored
View File

@ -76,7 +76,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml generated vendored
View File

@ -76,7 +76,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml generated vendored
View File

@ -77,7 +77,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml generated vendored
View File

@ -75,7 +75,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

4
cli/cmd/testdata/inject_emojivoto_list.golden.yml generated vendored
View File

@ -77,7 +77,7 @@ items:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -281,7 +281,7 @@ items:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

4
cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml generated vendored
View File

@ -77,7 +77,7 @@ items:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -281,7 +281,7 @@ items:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_pod.golden.yml generated vendored
View File

@ -65,7 +65,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml generated vendored
View File

@ -68,7 +68,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml generated vendored
View File

@ -67,7 +67,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml generated vendored
View File

@ -69,7 +69,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml generated vendored
View File

@ -76,7 +76,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

4
cli/cmd/testdata/inject_gettest_deployment.good.golden.yml generated vendored
View File

@ -71,7 +71,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -278,7 +278,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

2
cli/cmd/testdata/inject_tap_deployment_debug.golden.yml generated vendored
View File

@ -92,7 +92,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: 25,443,587,3306,4444,5432,6379,9300,11211
value: 25,587,3306,4444,5432,6379,9300,11211
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1414,7 +1414,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1483,7 +1483,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1647,7 +1647,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1712,7 +1711,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1785,7 +1784,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
- -trace-collector=collector.linkerd-jaeger.svc.cluster.local:55678
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
@ -1882,7 +1881,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2064,7 +2063,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2170,7 +2169,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1482,7 +1482,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1646,7 +1646,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1711,7 +1710,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1784,7 +1783,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1880,7 +1879,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2062,7 +2061,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2168,7 +2167,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1482,7 +1482,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1646,7 +1646,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1711,7 +1710,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1784,7 +1783,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: my.custom.registry/linkerd-io/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1880,7 +1879,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2062,7 +2061,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2168,7 +2167,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1482,7 +1482,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1646,7 +1646,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1711,7 +1710,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1784,7 +1783,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1880,7 +1879,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2062,7 +2061,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2168,7 +2167,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1482,7 +1482,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1646,7 +1646,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1711,7 +1710,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1784,7 +1783,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1880,7 +1879,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2062,7 +2061,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2168,7 +2167,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1164,7 +1164,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1482,7 +1482,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1556,7 +1556,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1739,7 +1739,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1824,7 +1823,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1902,7 +1901,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -2004,7 +2003,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2215,7 +2214,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2332,7 +2331,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1164,7 +1164,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1482,7 +1482,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1556,7 +1556,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1739,7 +1739,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1824,7 +1823,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1902,7 +1901,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -2004,7 +2003,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2215,7 +2214,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2332,7 +2331,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1077,7 +1077,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1344,7 +1344,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1413,7 +1413,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1577,7 +1577,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1642,7 +1641,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1715,7 +1714,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1811,7 +1810,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1944,7 +1943,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2050,7 +2049,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

17
cli/cmd/testdata/install_helm_output.golden generated vendored
View File

@ -1142,7 +1142,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1404,7 +1404,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1473,7 +1473,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1639,7 +1639,6 @@ spec:
linkerd.io/created-by: linkerd/helm linkerd-version
linkerd.io/identity-mode: default
linkerd.io/proxy-version: test-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1704,7 +1703,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1777,7 +1776,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=test.trust.domain
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1873,7 +1872,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2059,7 +2058,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2165,7 +2164,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "111"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init

17
cli/cmd/testdata/install_helm_output_ha.golden generated vendored
View File

@ -1160,7 +1160,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1473,7 +1473,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1547,7 +1547,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1732,7 +1732,6 @@ spec:
linkerd.io/created-by: linkerd/helm linkerd-version
linkerd.io/identity-mode: default
linkerd.io/proxy-version: test-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1817,7 +1816,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1895,7 +1894,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=test.trust.domain
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1997,7 +1996,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2212,7 +2211,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2329,7 +2328,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "111"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1164,7 +1164,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1481,7 +1481,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1555,7 +1555,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,444"
- --outbound-ports-to-ignore
- "333,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1742,7 +1742,6 @@ spec:
linkerd.io/proxy-version: test-proxy-version
asda: fasda
bingo: bongo
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1829,7 +1828,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1907,7 +1906,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=test.trust.domain
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -2009,7 +2008,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,444"
- --outbound-ports-to-ignore
- "333,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2232,7 +2231,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2349,7 +2348,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,444"
- --outbound-ports-to-ignore
- "333,443"
- "333"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1160,7 +1160,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1473,7 +1473,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1547,7 +1547,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1732,7 +1732,6 @@ spec:
linkerd.io/created-by: linkerd/helm linkerd-version
linkerd.io/identity-mode: default
linkerd.io/proxy-version: test-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1817,7 +1816,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1895,7 +1894,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=test.trust.domain
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:linkerd-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1997,7 +1996,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2212,7 +2211,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2329,7 +2328,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,222"
- --outbound-ports-to-ignore
- "111,443"
- "111"
image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1608,7 +1608,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1673,7 +1672,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1746,7 +1745,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1986,7 +1985,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}

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

@ -1648,7 +1648,6 @@ spec:
linkerd.io/created-by: CliVersion
linkerd.io/identity-mode: default
linkerd.io/proxy-version: ProxyVersion
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination

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

@ -1146,7 +1146,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1413,7 +1413,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1482,7 +1482,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1646,7 +1646,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1711,7 +1710,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1784,7 +1783,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=cluster.local
- -identity-trust-domain=cluster.local
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1880,7 +1879,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2062,7 +2061,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2168,7 +2167,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432,443"
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

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

@ -1132,7 +1132,7 @@ data:
isIngress: false
logFormat: plain
logLevel: warn,linkerd=info
opaquePorts: 25,443,587,3306,4444,5432,6379,9300,11211
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
outboundConnectTimeout: 1000ms
podInboundPorts: ""
ports:
@ -1399,7 +1399,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1468,7 +1468,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -1632,7 +1632,6 @@ spec:
linkerd.io/created-by: linkerd/cli dev-undefined
linkerd.io/identity-mode: default
linkerd.io/proxy-version: install-proxy-version
config.linkerd.io/opaque-ports: "8443"
config.linkerd.io/default-inbound-policy: "all-unauthenticated"
labels:
linkerd.io/control-plane-component: destination
@ -1697,7 +1696,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -1770,7 +1769,7 @@ spec:
- -enable-endpoint-slices=false
- -cluster-domain=example.com
- -identity-trust-domain=example.com
- -default-opaque-ports=25,443,587,3306,4444,5432,6379,9300,11211
- -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211
image: cr.l5d.io/linkerd/controller:install-control-plane-version
imagePullPolicy: IfNotPresent
livenessProbe:
@ -1866,7 +1865,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init
@ -2048,7 +2047,7 @@ spec:
- name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE
value: 10000ms
- name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION
value: "25,443,587,3306,4444,5432,6379,9300,11211"
value: "25,587,3306,4444,5432,6379,9300,11211"
- name: LINKERD2_PROXY_DESTINATION_CONTEXT
value: |
{"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"}
@ -2154,7 +2153,7 @@ spec:
- --inbound-ports-to-ignore
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568,443"
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.0
imagePullPolicy: IfNotPresent
name: linkerd-init

2
controller/proxy-injector/fake/data/pod-with-debug.patch.json generated
View File

@ -214,7 +214,7 @@
},
{
"name": "LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION",
"value": "25,443,587,3306,4444,5432,6379,9300,11211"
"value": "25,587,3306,4444,5432,6379,9300,11211"
},
{
"name": "LINKERD2_PROXY_DESTINATION_CONTEXT",

2
controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json generated
View File

@ -214,7 +214,7 @@
},
{
"name": "LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION",
"value": "25,443,587,3306,4444,5432,6379,9300,11211"
"value": "25,587,3306,4444,5432,6379,9300,11211"
},
{
"name": "LINKERD2_PROXY_DESTINATION_CONTEXT",

2
controller/proxy-injector/fake/data/pod.patch.json generated
View File

@ -204,7 +204,7 @@
},
{
"name": "LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION",
"value": "25,443,587,3306,4444,5432,6379,9300,11211"
"value": "25,587,3306,4444,5432,6379,9300,11211"
},
{
"name": "LINKERD2_PROXY_DESTINATION_CONTEXT",

2
pkg/charts/linkerd2/values_test.go
View File

@ -99,7 +99,7 @@ func TestNewValues(t *testing.T) {
WaitBeforeExitSeconds: 0,
OutboundConnectTimeout: "1000ms",
InboundConnectTimeout: "100ms",
OpaquePorts: "25,443,587,3306,4444,5432,6379,9300,11211",
OpaquePorts: "25,587,3306,4444,5432,6379,9300,11211",
Await: true,
},
ProxyInit: &ProxyInit{