mirror of https://github.com/linkerd/linkerd2.git
build(deps): bump cni-plugin from v1.5.2 to v1.6.0 (#13474)
This commit is contained in:
parent
57c272fce9
commit
985964846d
|
@ -32,7 +32,7 @@ Kubernetes: `>=1.22.0-0`
|
||||||
| ignoreOutboundPorts | string | `""` | Default set of outbound 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.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.pullPolicy | string | `"IfNotPresent"` | Pull policy for the linkerd-cni container |
|
||||||
| image.version | string | `"v1.5.2"` | Tag for the CNI container Docker image |
|
| image.version | string | `"v1.6.0"` | Tag for the CNI container Docker image |
|
||||||
| imagePullSecrets | list | `[]` | |
|
| imagePullSecrets | list | `[]` | |
|
||||||
| inboundProxyPort | int | `4143` | Inbound port for the proxy container |
|
| inboundProxyPort | int | `4143` | Inbound port for the proxy container |
|
||||||
| iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing |
|
| iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing |
|
||||||
|
|
|
@ -61,7 +61,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.5.2"
|
version: "v1.6.0"
|
||||||
# -- Pull policy for the linkerd-cni container
|
# -- Pull policy for the linkerd-cni container
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
|
|
|
@ -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.5.2
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
||||||
imagePullPolicy:
|
imagePullPolicy:
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
|
|
|
@ -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.5.2
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
||||||
imagePullPolicy:
|
imagePullPolicy:
|
||||||
env:
|
env:
|
||||||
- name: DEST_CNI_NET_DIR
|
- name: DEST_CNI_NET_DIR
|
||||||
|
|
|
@ -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.5.2
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
||||||
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.5.2
|
image: cr.l5d.io/linkerd/cni-plugin:v1.6.0
|
||||||
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.1"
|
var ProxyInitVersion = "v2.4.1"
|
||||||
var LinkerdCNIVersion = "v1.5.2"
|
var LinkerdCNIVersion = "v1.6.0"
|
||||||
|
|
||||||
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