From 64130e1eb5313a4b15c5b279edeb6f263b70fdd5 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Thu, 17 Oct 2024 20:18:20 -0500 Subject: [PATCH] Bump linkerd-cni to v1.5.2 (#13198) This release fixes the issue that when the node had hit the inotify limit, deploying the linkerd-cni daemonset would silently fail. Now the problem is caught and the pod enters a crash loop until the limit is no longer surpassed. --- charts/linkerd2-cni/README.md | 2 +- charts/linkerd2-cni/values.yaml | 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 +- pkg/healthcheck/healthcheck_test.go | 2 +- pkg/version/version.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index 862b11dc60fc9..fab5716478dad 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -32,7 +32,7 @@ Kubernetes: `>=1.22.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.5.1"` | Tag for the CNI container Docker image | +| image.version | string | `"v1.5.2"` | 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 dbebce81a3c7b..01195dd3a1c20 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.1" + version: "v1.5.2" # -- Pull policy for the linkerd-cni container pullPolicy: IfNotPresent diff --git a/cli/cmd/testdata/install-cni-plugin_default.golden b/cli/cmd/testdata/install-cni-plugin_default.golden index 63b2a5c273dee..08426543ac57d 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.1 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.2 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 b08654c528aa3..0f7d17937b4cd 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.1 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.2 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 0048f1f60c7be..8e9bcb66d1b28 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.1 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.2 imagePullPolicy: IfNotPresent env: - name: DEST_CNI_NET_DIR diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index a83b85119786f..c511d7198a515 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -2372,7 +2372,7 @@ spec: serviceAccountName: linkerd-cni containers: - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.5.1 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.2 env: - name: DEST_CNI_NET_DIR valueFrom: diff --git a/pkg/version/version.go b/pkg/version/version.go index bb6dad72d828e..888b7c6104b75 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -16,7 +16,7 @@ var Version = undefinedVersion // 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.1" -var LinkerdCNIVersion = "v1.5.1" +var LinkerdCNIVersion = "v1.5.2" const ( // undefinedVersion should take the form `channel-version` to conform to