diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 528d68f249f7c..d1669339e5129 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -187,9 +187,9 @@ Kubernetes: `>=1.22.0-0` | kubeAPI.clientBurst | int | `200` | Burst value over clientQPS | | kubeAPI.clientQPS | int | `100` | Maximum QPS sent to the kube-apiserver before throttling. See [token bucket rate limiter implementation](https://github.com/kubernetes/client-go/blob/v12.0.0/util/flowcontrol/throttle.go) | | linkerdVersion | string | `"linkerdVersionValue"` | control plane version. See Proxy section for proxy version | -| networkValidator.connectAddr | string | `"1.1.1.1:20001"` | Address to which the network-validator will attempt to connect. This should be an IP that the cluster is expected to be able to reach but a port it should not, e.g., a public IP for public clusters and a private IP for air-gapped clusters with a port like 20001. | +| networkValidator.connectAddr | string | `""` | Address to which the network-validator will attempt to connect. This should be an IP that the cluster is expected to be able to reach but a port it should not, e.g., a public IP for public clusters and a private IP for air-gapped clusters with a port like 20001. If empty, defaults to 1.1.1.1:20001 and [fd00::1]:20001 for IPv4 and IPv6 respectively. | | networkValidator.enableSecurityContext | bool | `true` | Include a securityContext in the network-validator pod spec | -| networkValidator.listenAddr | string | `"0.0.0.0:4140"` | Address to which network-validator listens to requests from itself | +| networkValidator.listenAddr | string | `"[::]:4140"` | Address to which network-validator listens to requests from itself | | networkValidator.logFormat | string | plain | Log format (`plain` or `json`) for network-validator | | networkValidator.logLevel | string | debug | Log level for the network-validator | | networkValidator.timeout | string | `"10s"` | Timeout before network-validator fails to validate the pod's network connectivity | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index ab361c86ac659..941ae0aa72dcd 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -324,11 +324,12 @@ networkValidator: # @default -- plain logFormat: plain # -- Address to which the network-validator will attempt to connect. This should be an IP - # that the cluster is expected to be able to reach but a port it should not, e.g., a public IP + # that the cluster is expected to be able to reach but a port it should not, e.g., a public IP # for public clusters and a private IP for air-gapped clusters with a port like 20001. - connectAddr: "1.1.1.1:20001" + # If empty, defaults to 1.1.1.1:20001 and [fd00::1]:20001 for IPv4 and IPv6 respectively. + connectAddr: "" # -- Address to which network-validator listens to requests from itself - listenAddr: "0.0.0.0:4140" + listenAddr: "[::]:4140" # -- Timeout before network-validator fails to validate the pod's network connectivity timeout: "10s" # -- Include a securityContext in the network-validator pod spec diff --git a/charts/linkerd2-cni/templates/cni-plugin.yaml b/charts/linkerd2-cni/templates/cni-plugin.yaml index ad5047aff1bf2..f897977299616 100644 --- a/charts/linkerd2-cni/templates/cni-plugin.yaml +++ b/charts/linkerd2-cni/templates/cni-plugin.yaml @@ -312,7 +312,8 @@ spec: command: - /usr/lib/linkerd/linkerd-cni-repair-controller args: - - --admin-addr=0.0.0.0:9990 + - --admin-addr + - "[::]:9990" - --log-format - {{ .Values.repairController.logFormat }} - --log-level diff --git a/charts/partials/templates/_network-validator.tpl b/charts/partials/templates/_network-validator.tpl index e312333111554..fafa7502f1ec7 100644 --- a/charts/partials/templates/_network-validator.tpl +++ b/charts/partials/templates/_network-validator.tpl @@ -24,9 +24,15 @@ args: - --log-level - {{ .Values.networkValidator.logLevel }} - --connect-addr - - {{ .Values.networkValidator.connectAddr }} + {{- if .Values.networkValidator.connectAddr }} + - {{ .Values.networkValidator.connectAddr | quote }} + {{- else if .Values.disableIPv6}} + - "1.1.1.1:20001" + {{- else }} + - "[fd00::1]:20001" + {{- end }} - --listen-addr - - {{ .Values.networkValidator.listenAddr }} + - {{ .Values.networkValidator.listenAddr | quote }} - --timeout - {{ .Values.networkValidator.timeout }} diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go index 926c654b7cc7c..7d06da27f8f2d 100644 --- a/cli/cmd/install_test.go +++ b/cli/cmd/install_test.go @@ -141,7 +141,7 @@ func TestRender(t *testing.T) { LogLevel: "debug", LogFormat: "plain", ConnectAddr: "1.1.1.1:20001", - ListenAddr: "0.0.0.0:4140", + ListenAddr: "[::]:4140", Timeout: "10s", }, Configs: charts.ConfigJSONs{ diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml index 93c5ed51022db..5af249346679f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml @@ -201,7 +201,7 @@ spec: - --connect-addr - 1.1.1.1:20001 - --listen-addr - - 0.0.0.0:4140 + - '[::]:4140' - --timeout - 10s command: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 4c521bb16b4c2..2d829019c350e 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index e7de829b5936a..a1c6e60327f47 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 285e8a64ddaab..18c338845bb7d 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index e7de829b5936a..a1c6e60327f47 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: 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 bd4474cb8c3d6..473eca5f8561d 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index dec581f376016..26dab93c0d729 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index e276828d51268..dd637565579aa 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index b3c5100dc1efb..3f98947c67767 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -611,9 +611,9 @@ data: imagePullSecrets: null linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -927,6 +927,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 1c3ca44aded28..e7cc31a95705c 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -611,9 +611,9 @@ data: imagePullSecrets: null linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -927,6 +927,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index b6e8d7cf7fad6..b1df359485d08 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -515,9 +515,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -806,6 +806,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 7349c82dd54a6..d8a78ab933440 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -561,9 +561,9 @@ data: imagePullSecrets: [] linkerdVersion: linkerd-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -848,6 +848,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: 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 41a3b93d32209..41e41942b20cb 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -588,9 +588,9 @@ data: imagePullSecrets: null linkerdVersion: linkerd-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -900,6 +900,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: 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 7b8412dcd79d0..ab5c6d36798e3 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 @@ -588,9 +588,9 @@ data: imagePullSecrets: null linkerdVersion: linkerd-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -900,6 +900,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 4cef7c269ba44..aae0cdede8d43 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -588,9 +588,9 @@ data: imagePullSecrets: null linkerdVersion: linkerd-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -904,6 +904,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: 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 db933e292a390..0c8d1bb4b10ff 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -583,9 +583,9 @@ data: imagePullSecrets: null linkerdVersion: linkerd-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -890,6 +890,7 @@ spec: matchLabels: linkerd.io/control-plane-component: identity --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index b758a8dd07917..1b4910056a489 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: @@ -1137,9 +1138,9 @@ spec: - --log-level - debug - --connect-addr - - 1.1.1.1:20001 + - "1.1.1.1:20001" - --listen-addr - - 0.0.0.0:4140 + - "[::]:4140" - --timeout - 10s securityContext: @@ -1612,9 +1613,9 @@ spec: - --log-level - debug - --connect-addr - - 1.1.1.1:20001 + - "1.1.1.1:20001" - --listen-addr - - 0.0.0.0:4140 + - "[::]:4140" - --timeout - 10s securityContext: @@ -1965,9 +1966,9 @@ spec: - --log-level - debug - --connect-addr - - 1.1.1.1:20001 + - "1.1.1.1:20001" - --listen-addr - - 0.0.0.0:4140 + - "[::]:4140" - --timeout - 10s securityContext: diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index bc14d8384e942..3820b8164ea0a 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -570,7 +570,7 @@ data: networkValidator: connectAddr: 1.1.1.1:20001 enableSecurityContext: false - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -828,6 +828,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: @@ -1994,7 +1995,7 @@ spec: --- apiVersion: v1 data: - linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJHSUQ6IDIxMDMKY29udHJvbGxlckltYWdlOiBDb250cm9sbGVySW1hZ2UKY29udHJvbGxlckxvZ0Zvcm1hdDogQ29udHJvbGxlckxvZ0Zvcm1hdApjb250cm9sbGVyTG9nTGV2ZWw6IENvbnRyb2xsZXJMb2dMZXZlbApkZWJ1Z0NvbnRhaW5lcjoKICBpbWFnZToKICAgIG5hbWU6IERlYnVnSW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBEZWJ1Z0ltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogRGVidWdWZXJzaW9uCmRlc3RpbmF0aW9uQ29udHJvbGxlcjogbnVsbApkaXNhYmxlSVB2NjogZmFsc2UKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGVuYWJsZVNlY3VyaXR5Q29udGV4dDogZmFsc2UKcG9kTW9uaXRvcjogbnVsbApwb2xpY3lDb250cm9sbGVyOgogIGltYWdlOgogICAgbmFtZTogUG9saWN5Q29udHJvbGxlckltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQb2xpY3lDb250cm9sbGVyVmVyc2lvbgogIGxvZ0xldmVsOiBsb2ctbGV2ZWwKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdApwb2xpY3lWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHBvbGljeSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJpb3JpdHlDbGFzc05hbWU6IFByaW9yaXR5Q2xhc3NOYW1lCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByb3h5OgogIGNvbnRyb2w6IG51bGwKICBkZWZhdWx0SW5ib3VuZFBvbGljeTogZGVmYXVsdC1hbGxvdy1wb2xpY3kKICBnaWQ6IDIxMDIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5VmVyc2lvbgogIGluYm91bmRDb25uZWN0VGltZW91dDogIiIKICBpbmJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIGxvZ0xldmVsOiB3YXJuLGxpbmtlcmQ9aW5mbwogIG9wYXF1ZVBvcnRzOiAyNSw0NDMsNTg3LDMzMDYsNTQzMiwxMTIxMQogIG91dGJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogY3B1LWxpbWl0CiAgICAgIHJlcXVlc3Q6IGNwdS1yZXF1ZXN0CiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiBtZW1vcnktbGltaXQKICAgICAgcmVxdWVzdDogbWVtb3J5LXJlcXVlc3QKICBzdGFydHVwUHJvYmU6IG51bGwKcHJveHlDb250YWluZXJOYW1lOiBQcm94eUNvbnRhaW5lck5hbWUKcHJveHlJbml0OgogIGlnbm9yZUluYm91bmRQb3J0czogIiIKICBpZ25vcmVPdXRib3VuZFBvcnRzOiAiNDQzIgogIGltYWdlOgogICAgbmFtZTogUHJveHlJbml0SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5SW5pdFZlcnNpb24KICBrdWJlQVBJU2VydmVyUG9ydHM6ICIiCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCndlYmhvb2tGYWlsdXJlUG9saWN5OiBXZWJob29rRmFpbHVyZVBvbGljeQo= + linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJHSUQ6IDIxMDMKY29udHJvbGxlckltYWdlOiBDb250cm9sbGVySW1hZ2UKY29udHJvbGxlckxvZ0Zvcm1hdDogQ29udHJvbGxlckxvZ0Zvcm1hdApjb250cm9sbGVyTG9nTGV2ZWw6IENvbnRyb2xsZXJMb2dMZXZlbApkZWJ1Z0NvbnRhaW5lcjoKICBpbWFnZToKICAgIG5hbWU6IERlYnVnSW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBEZWJ1Z0ltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogRGVidWdWZXJzaW9uCmRlc3RpbmF0aW9uQ29udHJvbGxlcjogbnVsbApkaXNhYmxlSVB2NjogZmFsc2UKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGNvbm5lY3RBZGRyOiAxLjEuMS4xOjIwMDAxCiAgZW5hYmxlU2VjdXJpdHlDb250ZXh0OiBmYWxzZQpwb2RNb25pdG9yOiBudWxsCnBvbGljeUNvbnRyb2xsZXI6CiAgaW1hZ2U6CiAgICBuYW1lOiBQb2xpY3lDb250cm9sbGVySW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFBvbGljeUNvbnRyb2xsZXJWZXJzaW9uCiAgbG9nTGV2ZWw6IGxvZy1sZXZlbAogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6IGNwdS1saW1pdAogICAgICByZXF1ZXN0OiBjcHUtcmVxdWVzdAogICAgbWVtb3J5OgogICAgICBsaW1pdDogbWVtb3J5LWxpbWl0CiAgICAgIHJlcXVlc3Q6IG1lbW9yeS1yZXF1ZXN0CnBvbGljeVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcG9saWN5IHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcmlvcml0eUNsYXNzTmFtZTogUHJpb3JpdHlDbGFzc05hbWUKcHJvZmlsZVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcHJvZmlsZSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJveHk6CiAgY29udHJvbDogbnVsbAogIGRlZmF1bHRJbmJvdW5kUG9saWN5OiBkZWZhdWx0LWFsbG93LXBvbGljeQogIGdpZDogMjEwMgogIGltYWdlOgogICAgbmFtZTogUHJveHlJbWFnZU5hbWUKICAgIHB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogUHJveHlWZXJzaW9uCiAgaW5ib3VuZENvbm5lY3RUaW1lb3V0OiAiIgogIGluYm91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgbG9nTGV2ZWw6IHdhcm4sbGlua2VyZD1pbmZvCiAgb3BhcXVlUG9ydHM6IDI1LDQ0Myw1ODcsMzMwNiw1NDMyLDExMjExCiAgb3V0Ym91bmRDb25uZWN0VGltZW91dDogIiIKICBvdXRib3VuZERpc2NvdmVyeUNhY2hlVW51c2VkVGltZW91dDogIiIKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdAogIHN0YXJ0dXBQcm9iZTogbnVsbApwcm94eUNvbnRhaW5lck5hbWU6IFByb3h5Q29udGFpbmVyTmFtZQpwcm94eUluaXQ6CiAgaWdub3JlSW5ib3VuZFBvcnRzOiAiIgogIGlnbm9yZU91dGJvdW5kUG9ydHM6ICI0NDMiCiAgaW1hZ2U6CiAgICBuYW1lOiBQcm94eUluaXRJbWFnZU5hbWUKICAgIHB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogUHJveHlJbml0VmVyc2lvbgogIGt1YmVBUElTZXJ2ZXJQb3J0czogIiIKcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IFdlYmhvb2tGYWlsdXJlUG9saWN5Cg== kind: Secret metadata: creationTimestamp: null diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 7359ae0a36e4d..31092ba128d14 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index c690c39231145..4e02e57081c89 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -584,9 +584,9 @@ data: imagePullSecrets: [] linkerdVersion: install-control-plane-version networkValidator: - connectAddr: 1.1.1.1:20001 + connectAddr: "" enableSecurityContext: true - listenAddr: 0.0.0.0:4140 + listenAddr: '[::]:4140' logFormat: plain logLevel: debug timeout: 10s @@ -875,6 +875,7 @@ spec: port: 8080 targetPort: 8080 --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/pkg/charts/linkerd2/values_test.go b/pkg/charts/linkerd2/values_test.go index 95f1860f295b9..096324e63f986 100644 --- a/pkg/charts/linkerd2/values_test.go +++ b/pkg/charts/linkerd2/values_test.go @@ -212,8 +212,8 @@ func TestNewValues(t *testing.T) { NetworkValidator: &NetworkValidator{ LogLevel: "debug", LogFormat: "plain", - ConnectAddr: "1.1.1.1:20001", - ListenAddr: "0.0.0.0:4140", + ConnectAddr: "", + ListenAddr: "[::]:4140", Timeout: "10s", EnableSecurityContext: true, },