mirror of https://github.com/linkerd/linkerd2.git
build(deps): bump cni-plugin from v1.6.0 to v1.6.2 (#13751)
https://github.com/linkerd/linkerd2-proxy-init/releases/tag/cni-plugin%2Fv1.6.2 > Fixed shutdown issue > > This release fixes an issue introduced in v1.6.0 where the linkerd-cni > pod was failing to complete its cleanup tasks during shutdown, leaving > the linkerd-cni active but potentially with revoked permissions, thus > interfering with the proper startup of pods in the node.
This commit is contained in:
parent
0cf18df740
commit
4f35e45b6a
|
@ -69,7 +69,7 @@ image:
|
||||||
# -- Docker image for the CNI plugin
|
# -- Docker image for the CNI plugin
|
||||||
name: "cr.l5d.io/linkerd/cni-plugin"
|
name: "cr.l5d.io/linkerd/cni-plugin"
|
||||||
# -- Tag for the CNI container Docker image
|
# -- Tag for the CNI container Docker image
|
||||||
version: "v1.6.0"
|
version: "v1.6.2"
|
||||||
# -- Pull policy for the linkerd-cni container
|
# -- Pull policy for the linkerd-cni container
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
|
|
|
@ -90,10 +90,10 @@ spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
k8s-app: linkerd-cni
|
k8s-app: linkerd-cni
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: RollingUpdate
|
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: 1
|
maxUnavailable: 1
|
||||||
|
type: RollingUpdate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -117,7 +117,7 @@ spec:
|
||||||
# script copies the files into place and then sleeps so
|
# script copies the files into place and then sleeps so
|
||||||
# that Kubernetes doesn't keep trying to restart it.
|
# that Kubernetes doesn't keep trying to restart it.
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.2
|
||||||
imagePullPolicy:
|
imagePullPolicy:
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
|
|
|
@ -91,10 +91,10 @@ spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
k8s-app: linkerd-cni
|
k8s-app: linkerd-cni
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: RollingUpdate
|
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: 1
|
maxUnavailable: 1
|
||||||
|
type: RollingUpdate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -118,7 +118,7 @@ spec:
|
||||||
# script copies the files into place and then sleeps so
|
# script copies the files into place and then sleeps so
|
||||||
# that Kubernetes doesn't keep trying to restart it.
|
# that Kubernetes doesn't keep trying to restart it.
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.2
|
||||||
imagePullPolicy:
|
imagePullPolicy:
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
|
|
|
@ -83,10 +83,10 @@ spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
k8s-app: linkerd-cni
|
k8s-app: linkerd-cni
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: RollingUpdate
|
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: 1
|
maxUnavailable: 1
|
||||||
|
type: RollingUpdate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -110,7 +110,7 @@ spec:
|
||||||
# script copies the files into place and then sleeps so
|
# script copies the files into place and then sleeps so
|
||||||
# that Kubernetes doesn't keep trying to restart it.
|
# that Kubernetes doesn't keep trying to restart it.
|
||||||
- name: install-cni
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
|
|
|
@ -2372,7 +2372,7 @@ spec:
|
||||||
serviceAccountName: linkerd-cni
|
serviceAccountName: linkerd-cni
|
||||||
containers:
|
containers:
|
||||||
- name: install-cni
|
- name: install-cni
|
||||||
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.2
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -16,7 +16,7 @@ var Version = undefinedVersion
|
||||||
// https://github.com/linkerd/linkerd2-proxy-init This has to be kept in sync
|
// 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.
|
// with the default version in the control plane's values.yaml.
|
||||||
var ProxyInitVersion = "v2.4.2"
|
var ProxyInitVersion = "v2.4.2"
|
||||||
var LinkerdCNIVersion = "v1.6.0"
|
var LinkerdCNIVersion = "v1.6.2"
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// undefinedVersion should take the form `channel-version` to conform to
|
// undefinedVersion should take the form `channel-version` to conform to
|
||||||
|
|
Loading…
Reference in New Issue