From 6e1763c1d862bda99a3590c8f868b7c8919f71dc Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Wed, 12 Jun 2024 17:07:36 -0500 Subject: [PATCH] Bump proxy-init to v2.4.1 and cni-plugin to v1.5.1 Those releases ensure that when IPv6 is enabled, the series of ip6tables commands succeed. If they fail, the proxy-init/linkerd-cni containers should fail as well, instead of ignoring errors. See linkerd/linkerd2-proxy-init#388 --- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd-control-plane/values.yaml | 2 +- charts/linkerd2-cni/README.md | 4 ++-- charts/linkerd2-cni/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_native_sidecar.golden.yml | 2 +- .../inject_emojivoto_deployment_opaque_ports.golden.yml | 2 +- .../inject_emojivoto_deployment_overridden.golden.yml | 2 +- .../inject_emojivoto_deployment_params.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 +- cli/cmd/testdata/install-cni-plugin_skip_ports.golden | 2 +- cli/cmd/testdata/install_cni_helm_default_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_gid_output.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 | 2 +- pkg/version/version.go | 4 ++-- 54 files changed, 100 insertions(+), 100 deletions(-) diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 6c57ad3ecbe83..e3279d021e75e 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -282,7 +282,7 @@ Kubernetes: `>=1.22.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 image | -| proxyInit.image.version | string | `"v2.4.0"` | Tag for the proxy-init container image | +| proxyInit.image.version | string | `"v2.4.1"` | Tag for the proxy-init container 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 d5e21e0e8dc31..bf7303d5792b7 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -292,7 +292,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container image - version: v2.4.0 + version: v2.4.1 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 f3d81767b2561..862b11dc60fc9 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -25,14 +25,14 @@ Kubernetes: `>=1.22.0-0` | commonLabels | object | `{}` | Labels to apply to all resources | | destCNIBinDir | string | `"/opt/cni/bin"` | Directory on the host where the CNI configuration will be placed | | destCNINetDir | string | `"/etc/cni/net.d"` | Directory on the host where the CNI plugin binaries reside | -| disableIPv6 | bool | `false` | Disables adding IPv6 rules on top of IPv4 rules | +| disableIPv6 | bool | `true` | Disables adding IPv6 rules on top of IPv4 rules | | enablePSP | bool | `false` | Add a PSP resource and bind it to the linkerd-cni ServiceAccounts. Note PSP has been deprecated since k8s v1.21 | | extraInitContainers | list | `[]` | Add additional initContainers to the daemonset | | ignoreInboundPorts | string | `""` | Default set of inbound ports to skip via iptables | | 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.5.0"` | Tag for the CNI container Docker image | +| image.version | string | `"v1.5.1"` | Tag for the CNI container Docker image | | imagePullSecrets | list | `[]` | | | inboundProxyPort | int | `4143` | Inbound port for the proxy container | | iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing | diff --git a/charts/linkerd2-cni/values.yaml b/charts/linkerd2-cni/values.yaml index 8dd4672f4921b..dbebce81a3c7b 100644 --- a/charts/linkerd2-cni/values.yaml +++ b/charts/linkerd2-cni/values.yaml @@ -61,7 +61,7 @@ image: # -- Docker image for the CNI plugin name: "cr.l5d.io/linkerd/cni-plugin" # -- Tag for the CNI container Docker image - version: "v1.5.0" + version: "v1.5.1" # -- Pull policy for the linkerd-cni container pullPolicy: IfNotPresent diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index ac0b0f7e65c90..a856779b05ce3 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 48680257a1793..b35f95457e6f9 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -427,7 +427,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 fb9e52c343a06..0ed0e53827caf 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 4b1eeb6428b72..11cffb629c297 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.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.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 2ceaa76a3918c..2c130b2da9229 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -449,7 +449,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -695,7 +695,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -941,7 +941,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 c4af2eda3127c..d5c104169fea9 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 b2438be7fed7d..433296a1d38a8 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -206,7 +206,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 138c86dbbed08..784daf77feb6a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -195,7 +195,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 8537d3b4f898f..c386d7fa36b13 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -217,7 +217,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 b8d14a6081641..a10f767b2e22f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -220,7 +220,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 784424cfff92a..2a0b1bb83de0c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -449,7 +449,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 02fb4f559da42..96a4bb4e63d8f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -216,7 +216,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 b23359d2e5def..988b5b6be3695 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 5733deb322322..1d224c86f7ff9 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -204,7 +204,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index 37f3174c82198..b6ab8d7dced99 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -49,7 +49,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 dc0463478bdb1..487718737e19c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -204,7 +204,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 c764d21291b25..c5f2caf75c1f2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -204,7 +204,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index 36943e3eca0bb..e3fdfbae192ec 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 ac2445f9b58e6..d585047342128 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -205,7 +205,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 9b91c1bc43a16..039ad29dea8ca 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -205,7 +205,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 8a7bdb8c5004f..0bb81b9a1f4d3 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -205,7 +205,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -445,7 +445,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 e90a6e3534b07..27ef79f694078 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -205,7 +205,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -445,7 +445,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 6b17d585ed4c1..476ef6b4333c9 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -187,7 +187,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 34e352756c653..fbd773527c42c 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -190,7 +190,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 debbd2212c0f6..870db6bbce9bf 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -189,7 +189,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 6adba3dd607c5..fc77ad9b2b965 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -198,7 +198,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 9db5eb416bb60..99226518fc2ac 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -204,7 +204,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 7aa59b35c099e..097e622812662 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -205,7 +205,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -453,7 +453,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 b02b45a67aca3..1e15e95bffbde 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -266,7 +266,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 5f25ddada84e6..63b2a5c273dee 100644 --- a/cli/cmd/testdata/install-cni-plugin_default.golden +++ b/cli/cmd/testdata/install-cni-plugin_default.golden @@ -122,7 +122,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.5.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.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 5ccb6d3dd7c29..b08654c528aa3 100644 --- a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden +++ b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden @@ -123,7 +123,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.5.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.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 42f0eadf88f8d..0048f1f60c7be 100644 --- a/cli/cmd/testdata/install_cni_helm_default_output.golden +++ b/cli/cmd/testdata/install_cni_helm_default_output.golden @@ -115,7 +115,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.5.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.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 e31a661febed6..5bb5caf9a5a4b 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1128,7 +1128,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1977,7 +1977,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 15cefc2d9bab0..8833fba353f1c 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 22a2a653c3be7..91a896a11637b 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -733,7 +733,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 15cefc2d9bab0..8833fba353f1c 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 1c8883ec735c1..5900caef85315 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 c2e0e51ccee01..bbab334c479bc 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1125,7 +1125,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1601,7 +1601,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1955,7 +1955,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index a379dae71b937..bce485657b1a2 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1131,7 +1131,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1622,7 +1622,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 7001d4030d105..f28d0f24aa9c4 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -760,7 +760,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1209,7 +1209,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1740,7 +1740,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2139,7 +2139,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 c9f44af3676b0..5cb8e493ce34a 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -760,7 +760,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1209,7 +1209,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1740,7 +1740,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2139,7 +2139,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 ad8ce26615dec..0ed56a2029e90 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -664,7 +664,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1058,7 +1058,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1543,7 +1543,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1846,7 +1846,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 064f083e5a44b..57378089dc21c 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 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 3998560193df9..9ff2c0b5ce0c7 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 64d150f83f9d8..18a57a3df69a9 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -733,7 +733,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.4.0 + version: v2.4.1 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1127,7 +1127,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1612,7 +1612,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1975,7 +1975,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.1 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 7aa4dde44a56e..e8982dfa9d615 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -59,7 +59,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.1", "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 1d15a0f78c7ed..9dcd607bbb480 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 @@ -69,7 +69,7 @@ "--outbound-ports-to-ignore", "34567" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.1", "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 e956b2075e84e..2019fe14b97d6 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -59,7 +59,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.1", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index 0c54487d4d148..f93916205d6f2 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -2404,7 +2404,7 @@ spec: serviceAccountName: linkerd-cni containers: - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.5.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.1 env: - name: DEST_CNI_NET_DIR valueFrom: diff --git a/pkg/version/version.go b/pkg/version/version.go index 0c091fc8dafd0..bb6dad72d828e 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.4.0" -var LinkerdCNIVersion = "v1.5.0" +var ProxyInitVersion = "v2.4.1" +var LinkerdCNIVersion = "v1.5.1" const ( // undefinedVersion should take the form `channel-version` to conform to