From 1e8d96509b64fd1e37c09aa5b787a6582cada07c Mon Sep 17 00:00:00 2001 From: Steve Jenson Date: Wed, 1 Feb 2023 11:53:02 -0800 Subject: [PATCH] Upgrading proxy-init from v2.1.0 to v2.2.0 this time without JSON formatting (#10234) Signed-off-by: Steve Jenson --- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd-control-plane/values.yaml | 2 +- .../testdata/inject-filepath/expected/injected_nginx.yaml | 2 +- .../inject-filepath/expected/injected_nginx_redis.yaml | 4 ++-- .../testdata/inject-filepath/expected/injected_redis.yaml | 2 +- cli/cmd/testdata/inject_contour.golden.yml | 2 +- .../testdata/inject_emojivoto_already_injected.golden.yml | 8 ++++---- cli/cmd/testdata/inject_emojivoto_deployment.golden.yml | 2 +- .../inject_emojivoto_deployment_access_log.golden.yml | 2 +- ...ployment_automountServiceAccountToken_false.golden.yml | 2 +- .../inject_emojivoto_deployment_capabilities.golden.yml | 2 +- ...nject_emojivoto_deployment_config_overrides.golden.yml | 2 +- ...inject_emojivoto_deployment_controller_name.golden.yml | 4 ++-- .../testdata/inject_emojivoto_deployment_debug.golden.yml | 2 +- ...inject_emojivoto_deployment_empty_resources.golden.yml | 2 +- ...ject_emojivoto_deployment_hostNetwork_false.golden.yml | 2 +- .../inject_emojivoto_deployment_opaque_ports.golden.yml | 2 +- .../inject_emojivoto_deployment_overridden.golden.yml | 2 +- .../inject_emojivoto_deployment_proxyignores.golden.yml | 2 +- .../testdata/inject_emojivoto_deployment_udp.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_list.golden.yml | 4 ++-- .../inject_emojivoto_list_empty_resources.golden.yml | 4 ++-- cli/cmd/testdata/inject_emojivoto_pod.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml | 2 +- .../testdata/inject_emojivoto_pod_proxyignores.golden.yml | 2 +- .../inject_emojivoto_pod_with_requests.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml | 2 +- .../testdata/inject_gettest_deployment.good.golden.yml | 4 ++-- cli/cmd/testdata/inject_tap_deployment_debug.golden.yml | 2 +- .../testdata/install_controlplane_tracing_output.golden | 8 ++++---- cli/cmd/testdata/install_custom_domain.golden | 8 ++++---- cli/cmd/testdata/install_custom_registry.golden | 8 ++++---- cli/cmd/testdata/install_default.golden | 8 ++++---- .../testdata/install_default_override_dst_get_nets.golden | 8 ++++---- cli/cmd/testdata/install_default_token.golden | 8 ++++---- cli/cmd/testdata/install_ha_output.golden | 8 ++++---- cli/cmd/testdata/install_ha_with_overrides_output.golden | 8 ++++---- cli/cmd/testdata/install_heartbeat_disabled_output.golden | 8 ++++---- cli/cmd/testdata/install_no_init_container.golden | 2 +- cli/cmd/testdata/install_proxy_ignores.golden | 8 ++++---- cli/cmd/testdata/install_values_file.golden | 8 ++++---- .../proxy-injector/fake/data/pod-with-debug.patch.json | 2 +- .../fake/data/pod-with-ns-annotations.patch.json | 2 +- controller/proxy-injector/fake/data/pod.patch.json | 2 +- pkg/healthcheck/healthcheck_test.go | 4 ++-- pkg/healthcheck/sidecar_test.go | 2 +- pkg/version/version.go | 2 +- 47 files changed, 89 insertions(+), 89 deletions(-) diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 82bee26c9..ebae2a86a 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -240,7 +240,7 @@ Kubernetes: `>=1.21.0-0` | proxyInit.ignoreOutboundPorts | string | `"4567,4568"` | Default set of outbound ports to skip via iptables - Galera (4567,4568) | | proxyInit.image.name | string | `"cr.l5d.io/linkerd/proxy-init"` | Docker image for the proxy-init container | | proxyInit.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy-init container Docker image | -| proxyInit.image.version | string | `"v2.1.0"` | Tag for the proxy-init container Docker image | +| proxyInit.image.version | string | `"v2.2.0"` | Tag for the proxy-init container Docker image | | proxyInit.iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing. Currently, proxy-init can be run either in 'nft' or in 'legacy' mode. The mode will control which utility binary will be called. The host must support whichever mode will be used | | proxyInit.kubeAPIServerPorts | string | `"443,6443"` | Default set of ports to skip via iptables for control plane components so they can communicate with the Kubernetes API Server | | proxyInit.logFormat | string | plain | Log format (`plain` or `json`) for the proxy-init | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index c76a64a8c..227a21e0b 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -210,7 +210,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container Docker image - version: v2.1.0 + version: v2.2.0 resources: cpu: # -- Maximum amount of CPU units that the proxy-init container can use diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index cb2cea6f1..8b7cf40d8 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -167,7 +167,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml index 34afcc2f4..237231d7e 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -167,7 +167,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -376,7 +376,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index 252eeac04..7f07fea6f 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -167,7 +167,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 78bf8b486..3a3888466 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -207,7 +207,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index f7983ef9e..c9945245e 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -178,7 +178,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -398,7 +398,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -618,7 +618,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -838,7 +838,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index da0334c35..4c3e6b6b2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -178,7 +178,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index cabcc3116..81ebedab2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -181,7 +181,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index de03126bb..73c0e8a42 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -170,7 +170,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index dc5fdef1c..a898fd16b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml index 1a7ddaa85..6a53f8eb0 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -195,7 +195,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml index 545ab6c97..49cee3862 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -178,7 +178,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -398,7 +398,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index c10cd7a4a..52d78aff6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -183,7 +183,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml index 2cf4c34f0..b2202b90e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -178,7 +178,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml index b1314e6b0..3f0ad32ea 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index ddff8da5d..c78a5306c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index f30ba1cba..1ee20609f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index 67c47f724..a9fb06914 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -180,7 +180,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index ad4a416d7..4b7a9e7c8 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -180,7 +180,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 539aa125b..853d4f2cd 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -180,7 +180,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -394,7 +394,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml index 9020771e9..43e0a53fe 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -180,7 +180,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -394,7 +394,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index c2da45fa5..fafd50b8e 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -162,7 +162,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 558be8736..34c4540e9 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -165,7 +165,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 672625b17..c4a91046b 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -164,7 +164,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml index 5f93f2afe..37d9f9624 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -173,7 +173,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 63f3e0baf..d78a55099 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index 09a38985e..25a479318 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -180,7 +180,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -402,7 +402,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index 4904f5ce7..c123eafa4 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -232,7 +232,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 149b54d8c..941ba90ec 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -948,7 +948,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1399,7 +1399,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1732,7 +1732,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 5c0cd8aba..f7cc83047 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 8be800b33..989db449a 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -586,7 +586,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.1.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.1.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: my.custom.registry/linkerd-io/proxy-init:v2.1.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 5c0cd8aba..f7cc83047 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: 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 1f000421c..e7eb08ea9 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index e67bcc258..d6131e0f3 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -945,7 +945,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1386,7 +1386,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 0f5c77239..362e5d63f 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -613,7 +613,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1029,7 +1029,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1525,7 +1525,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1894,7 +1894,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index f6453aa58..018fca50c 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -613,7 +613,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1029,7 +1029,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1525,7 +1525,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1894,7 +1894,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index a5bb25823..e610bc88e 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -517,7 +517,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -878,7 +878,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1328,7 +1328,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1602,7 +1602,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 0e616113a..999146021 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 5d2636f1c..4ab91452a 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 12be5826a..debff8597 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -586,7 +586,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.1.0 + version: v2.2.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -947,7 +947,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1397,7 +1397,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1730,7 +1730,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v2.1.0 + image: cr.l5d.io/linkerd/proxy-init:v2.2.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index d7fa08b8d..e8b7c8c36 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.1.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index 19cc476b3..99b8782e9 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -68,7 +68,7 @@ "--outbound-ports-to-ignore", "34567" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.1.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 5348d39ef..a1f875eb7 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.1.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index 7d4250409..20b5f3bc5 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -1763,7 +1763,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.1.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | @@ -1916,7 +1916,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.1.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | diff --git a/pkg/healthcheck/sidecar_test.go b/pkg/healthcheck/sidecar_test.go index 1b02a3507..7697cc0bd 100644 --- a/pkg/healthcheck/sidecar_test.go +++ b/pkg/healthcheck/sidecar_test.go @@ -98,7 +98,7 @@ func TestHasExistingSidecars(t *testing.T) { podSpec: &corev1.PodSpec{ InitContainers: []corev1.Container{ { - Image: "cr.l5d.io/linkerd/proxy-init:1.0.0", + Image: "cr.l5d.io/linkerd/proxy-init:2.2.0", }, }, }, diff --git a/pkg/version/version.go b/pkg/version/version.go index 1cda7248c..574e40b36 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -15,7 +15,7 @@ var Version = undefinedVersion // ProxyInitVersion is the pinned version of the proxy-init, from // https://github.com/linkerd/linkerd2-proxy-init This has to be kept in sync // with the default version in the control plane's values.yaml. -var ProxyInitVersion = "v2.1.0" +var ProxyInitVersion = "v2.2.0" const ( // undefinedVersion should take the form `channel-version` to conform to