diff --git a/charts/linkerd2-cni/values.yaml b/charts/linkerd2-cni/values.yaml index 33a3c5a20..905ba336e 100644 --- a/charts/linkerd2-cni/values.yaml +++ b/charts/linkerd2-cni/values.yaml @@ -69,7 +69,7 @@ image: # -- Docker image for the CNI plugin name: "cr.l5d.io/linkerd/cni-plugin" # -- Tag for the CNI container Docker image - version: "v1.6.0" + version: "v1.6.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 87af4aae4..33f1e6cfc 100644 --- a/cli/cmd/testdata/install-cni-plugin_default.golden +++ b/cli/cmd/testdata/install-cni-plugin_default.golden @@ -90,10 +90,10 @@ spec: selector: matchLabels: k8s-app: linkerd-cni - updateStrategy: - type: RollingUpdate + updateStrategy: rollingUpdate: maxUnavailable: 1 + type: RollingUpdate template: metadata: labels: @@ -117,7 +117,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.6.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.6.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 9f64f85d5..5659c8682 100644 --- a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden +++ b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden @@ -91,10 +91,10 @@ spec: selector: matchLabels: k8s-app: linkerd-cni - updateStrategy: - type: RollingUpdate + updateStrategy: rollingUpdate: maxUnavailable: 1 + type: RollingUpdate template: metadata: labels: @@ -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.6.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.6.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 8e574f5f4..34ec474c2 100644 --- a/cli/cmd/testdata/install_cni_helm_default_output.golden +++ b/cli/cmd/testdata/install_cni_helm_default_output.golden @@ -83,10 +83,10 @@ spec: selector: matchLabels: k8s-app: linkerd-cni - updateStrategy: - type: RollingUpdate + updateStrategy: rollingUpdate: maxUnavailable: 1 + type: RollingUpdate template: metadata: labels: @@ -110,7 +110,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.6.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.6.2 imagePullPolicy: IfNotPresent env: - name: DEST_CNI_NET_DIR diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index d24300804..36ccae788 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.6.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.6.2 env: - name: DEST_CNI_NET_DIR valueFrom: diff --git a/pkg/version/version.go b/pkg/version/version.go index 6197e77dd..1cba43fa5 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.2" -var LinkerdCNIVersion = "v1.6.0" +var LinkerdCNIVersion = "v1.6.2" const ( // undefinedVersion should take the form `channel-version` to conform to