From 676af38820541604b047de956b6a50073052621f Mon Sep 17 00:00:00 2001 From: Matei David Date: Thu, 7 Sep 2023 13:12:13 +0000 Subject: [PATCH] Bump CNI plugin and proxy-init versions Bump CNI plugin to v1.2.1 Bump proxy-init to v2.2.2 Both dependencies include a fix for CVE-2023-2603. Since alpine is used as the runtime image, there is a security vulnerability detected in the produced images (due to an issue with libcap). The alpine images have been bumped to address the CVE. Signed-off-by: Matei David --- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd-control-plane/values.yaml | 2 +- charts/linkerd2-cni/README.md | 2 +- charts/linkerd2-cni/values.yaml | 2 +- cli/cmd/install-cni-plugin_test.go | 2 +- cli/cmd/install_cni_helm_test.go | 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 +- cli/cmd/testdata/install-cni-plugin_default.golden | 2 +- .../testdata/install-cni-plugin_fully_configured.golden | 2 +- .../install-cni-plugin_fully_configured_equal_dsts.golden | 2 +- ...nstall-cni-plugin_fully_configured_no_namespace.golden | 2 +- cli/cmd/testdata/install-cni-plugin_skip_ports.golden | 2 +- cli/cmd/testdata/install_cni_helm_default_output.golden | 2 +- cli/cmd/testdata/install_cni_helm_override_output.golden | 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 | 6 +++--- pkg/version/version.go | 4 ++-- test/integration/multicluster/install_test.go | 2 +- 58 files changed, 102 insertions(+), 102 deletions(-) diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index e5f10bcc08a3e..f94013aa2a041 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -256,7 +256,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.2.1"` | Tag for the proxy-init container Docker image | +| proxyInit.image.version | string | `"v2.2.2"` | 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 38e50541997fc..9b474e598d056 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -217,7 +217,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container Docker image - version: v2.2.1 + version: v2.2.2 resources: cpu: # -- Maximum amount of CPU units that the proxy-init container can use diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index 49fcb2da5f4e9..3a53046f3295e 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -31,7 +31,7 @@ Kubernetes: `>=1.21.0-0` | ignoreOutboundPorts | string | `""` | Default set of outbound ports to skip via iptables | | image.name | string | `"cr.l5d.io/linkerd/cni-plugin"` | Docker image for the CNI plugin | | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the linkerd-cni container | -| image.version | string | `"v1.2.0"` | Tag for the CNI container Docker image | +| image.version | string | `"v1.2.1"` | Tag for the CNI container Docker image | | imagePullSecrets | list | `[]` | | | inboundProxyPort | int | `4143` | Inbound port for the proxy container | | logLevel | string | `"info"` | Log level for the CNI plugin | diff --git a/charts/linkerd2-cni/values.yaml b/charts/linkerd2-cni/values.yaml index fdc5a335b931c..6c974d86daabc 100644 --- a/charts/linkerd2-cni/values.yaml +++ b/charts/linkerd2-cni/values.yaml @@ -53,7 +53,7 @@ image: # -- Docker image for the CNI plugin name: "cr.l5d.io/linkerd/cni-plugin" # -- Tag for the CNI container Docker image - version: "v1.2.0" + version: "v1.2.1" # -- Pull policy for the linkerd-cni container pullPolicy: IfNotPresent diff --git a/cli/cmd/install-cni-plugin_test.go b/cli/cmd/install-cni-plugin_test.go index 66b2282c1f7cb..66299e5e7d412 100644 --- a/cli/cmd/install-cni-plugin_test.go +++ b/cli/cmd/install-cni-plugin_test.go @@ -16,7 +16,7 @@ func TestRenderCNIPlugin(t *testing.T) { image := cniPluginImage{ name: "my-docker-registry.io/awesome/cni-plugin-test-image", - version: "v1.2.0", + version: "v1.2.1", pullPolicy: nil, } fullyConfiguredOptions := &cniPluginOptions{ diff --git a/cli/cmd/install_cni_helm_test.go b/cli/cmd/install_cni_helm_test.go index cd3f5dda190c5..46fe0bad19e08 100644 --- a/cli/cmd/install_cni_helm_test.go +++ b/cli/cmd/install_cni_helm_test.go @@ -35,7 +35,7 @@ func TestRenderCniHelm(t *testing.T) { "logLevel": "debug", "image": { "name": "cr.l5d.io/linkerd/cni-plugin", - "version": "v1.2.0" + "version": "v1.2.1" }, "proxyUID": 1111, "destCNINetDir": "/etc/cni/net.d-test", diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index a204f6eb85c11..e9829bd9f70a1 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -172,7 +172,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 3292dc172b91d..5f6f51ef7be3e 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -172,7 +172,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -386,7 +386,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 6b7611ad39e95..480c39ed45a33 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -172,7 +172,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 0f62b4635bd8b..98d18f3e2d34f 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -212,7 +212,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 21f92897b2457..f41c159808126 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -408,7 +408,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -633,7 +633,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -858,7 +858,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 318142f2b3dc6..a52bf34604fe3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 d9050f7abe4ef..1bf3bff62a090 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -186,7 +186,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 73b4c31d45200..88614dd3bc84e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -175,7 +175,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 e8673aec2c84d..c242bca253e5a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -196,7 +196,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 6bb96c86feab9..6653aaf0f8836 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -200,7 +200,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 905589d80528d..582a964b979b1 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -408,7 +408,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 a685318c025ab..6342c0ea60920 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -188,7 +188,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 3e75d9ad43fa9..8874cd97665e4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 658d675a76097..588062e069cb1 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -184,7 +184,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 68fc7c3034876..32b9595f30925 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -184,7 +184,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 01014e6e66384..c0d81659f580e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -184,7 +184,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 390cf862f714a..fedbde1467a9e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -185,7 +185,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 a21d2777c0f1d..182896a1d5493 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -185,7 +185,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 2c4eb0cc093d5..3d73dad1ef674 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -185,7 +185,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -404,7 +404,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 22906499a113d..650f1ffe3a315 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -185,7 +185,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -404,7 +404,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 2ba585b5dc3c0..37c4451b8a160 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -167,7 +167,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 2e73b6a48bc0d..c88354fe8d2f7 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 fd04fd5e99b69..d0745d6baf877 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -169,7 +169,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 f619231163755..32dd3b16d495d 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.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.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 ecaf2eef604fe..bc5b3ab080250 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -184,7 +184,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 0324876bcde90..257e57afa5d53 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -185,7 +185,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -412,7 +412,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 2ac7fff368d90..2f85198178b14 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -237,7 +237,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install-cni-plugin_default.golden b/cli/cmd/testdata/install-cni-plugin_default.golden index 938442369fffb..4e6cb1068a68d 100644 --- a/cli/cmd/testdata/install-cni-plugin_default.golden +++ b/cli/cmd/testdata/install-cni-plugin_default.golden @@ -118,7 +118,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.2.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.2.1 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured.golden index 8585608c9c5f6..ea4051744fc9f 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured.golden @@ -119,7 +119,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.0 + image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.1 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden index e8c7cff830409..cfc1307a91308 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden @@ -119,7 +119,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.0 + image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.1 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden index 8585608c9c5f6..ea4051744fc9f 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden @@ -119,7 +119,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.0 + image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.2.1 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden index 81d0c745f9039..d7b8a66266c03 100644 --- a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden +++ b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden @@ -119,7 +119,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.2.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.2.1 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install_cni_helm_default_output.golden b/cli/cmd/testdata/install_cni_helm_default_output.golden index f6340d7549cd6..13d2dd20a6017 100644 --- a/cli/cmd/testdata/install_cni_helm_default_output.golden +++ b/cli/cmd/testdata/install_cni_helm_default_output.golden @@ -111,7 +111,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.2.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.2.1 imagePullPolicy: IfNotPresent env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install_cni_helm_override_output.golden b/cli/cmd/testdata/install_cni_helm_override_output.golden index bfd629f942c4c..5b48edf298af6 100644 --- a/cli/cmd/testdata/install_cni_helm_override_output.golden +++ b/cli/cmd/testdata/install_cni_helm_override_output.golden @@ -112,7 +112,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.2.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.2.1 imagePullPolicy: IfNotPresent env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index e64900ad6722c..c35ef99bfe1c9 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1027,7 +1027,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1488,7 +1488,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1828,7 +1828,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 8979e757903f4..7919c437b4d3c 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 0e8c04d51b302..fffacf36f4d9f 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -660,7 +660,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.1 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.1 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.1 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 8979e757903f4..7919c437b4d3c 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 560964755f790..e034030ba3f87 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 cc99a748d5e63..4ef34fcf7bb13 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1024,7 +1024,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1475,7 +1475,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1806,7 +1806,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 0f6e85269596b..66df71e9c7c8c 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -687,7 +687,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1108,7 +1108,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1614,7 +1614,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1990,7 +1990,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 f4b34f8cd2cc1..4b743a82437f9 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -687,7 +687,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1108,7 +1108,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1614,7 +1614,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1990,7 +1990,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 ad1e1c37da569..cf97869b82965 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -591,7 +591,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -957,7 +957,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1417,7 +1417,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1697,7 +1697,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 df5197f6ea8f7..3e6c8a84cad2d 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 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 27ca3caf2c85d..1af95a5f7df08 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 6e6ce65b35ed4..c76f042843f6a 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -660,7 +660,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.1 + version: v2.2.2 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1026,7 +1026,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1486,7 +1486,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1826,7 +1826,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.1 + image: cr.l5d.io/linkerd/proxy-init:v2.2.2 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 3229fb0af25ad..5eb3c6bce02ce 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.2.1", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.2", "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 b7785fc4f0683..b4202524a3b3f 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.2.1", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.2", "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 a940c4f60e8de..cd3c07b99d56f 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.2.1", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.2", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index e89b61d5fd161..adca3f4e065df 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.2.1","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.2","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.2.1","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.2","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | @@ -2421,7 +2421,7 @@ spec: serviceAccountName: linkerd-cni containers: - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.2.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.2.1 env: - name: DEST_CNI_NET_DIR valueFrom: diff --git a/pkg/version/version.go b/pkg/version/version.go index 72202b08cea9a..a8fe35851223e 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -15,8 +15,8 @@ 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.2.1" -var LinkerdCNIVersion = "v1.2.0" +var ProxyInitVersion = "v2.2.2" +var LinkerdCNIVersion = "v1.2.1" const ( // undefinedVersion should take the form `channel-version` to conform to diff --git a/test/integration/multicluster/install_test.go b/test/integration/multicluster/install_test.go index 0f592fc8ef345..1ebb58a66ecaa 100644 --- a/test/integration/multicluster/install_test.go +++ b/test/integration/multicluster/install_test.go @@ -111,7 +111,7 @@ func TestInstall(t *testing.T) { "install", "--controller-log-level", "debug", "--set", "proxyInit.image.name=ghcr.io/linkerd/proxy-init", - "--set", "proxyInit.image.version=v2.2.1", + "--set", "proxyInit.image.version=v2.2.2", "--set", fmt.Sprintf("proxy.image.version=%s", TestHelper.GetVersion()), "--set", "heartbeatSchedule=1 2 3 4 5", "--identity-trust-anchors-file", rootPath,