linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump cni-plugin to v1.1.1 (#10780) 

Fixed incompatibility issue with AWS CNI addon in EKS, that was
forbidding pods to acquire networking after scaling up nodes.

Credits to @frimik for providing a diagnosis and fix, and to @JonKusz for the detailed repro
This commit is contained in:
Alejandro Pedraza 2023-04-20 12:21:09 -05:00 committed by GitHub
parent 94f551fca0
commit f57c925ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2-cni/README.md
View File

@ -31,7 +31,7 @@ Kubernetes: `>=1.21.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.1.0"` | Tag for the CNI container Docker image | | image.version | string | `"v1.1.1"` | 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 |
| logLevel | string | `"info"` | Log level for the CNI plugin | | logLevel | string | `"info"` | Log level for the CNI plugin |

2
charts/linkerd2-cni/values.yaml
View File

@ -53,7 +53,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.1.0" version: "v1.1.1"
# -- Pull policy for the linkerd-cni container # -- Pull policy for the linkerd-cni container
pullPolicy: IfNotPresent pullPolicy: IfNotPresent

2
cli/cmd/install-cni-plugin_test.go
View File

@ -16,7 +16,7 @@ func TestRenderCNIPlugin(t *testing.T) {
image := cniPluginImage{ image := cniPluginImage{
name: "my-docker-registry.io/awesome/cni-plugin-test-image", name: "my-docker-registry.io/awesome/cni-plugin-test-image",
version: "v1.1.0", version: "v1.1.1",
pullPolicy: nil, pullPolicy: nil,
} }
fullyConfiguredOptions := &cniPluginOptions{ fullyConfiguredOptions := &cniPluginOptions{

2
cli/cmd/install_cni_helm_test.go
View File

@ -35,7 +35,7 @@ func TestRenderCniHelm(t *testing.T) {
"logLevel": "debug", "logLevel": "debug",
"image": { "image": {
"name": "cr.l5d.io/linkerd/cni-plugin", "name": "cr.l5d.io/linkerd/cni-plugin",
"version": "v1.1.0" "version": "v1.1.1"
}, },
"proxyUID": 1111, "proxyUID": 1111,
"destCNINetDir": "/etc/cni/net.d-test", "destCNINetDir": "/etc/cni/net.d-test",

2
cli/cmd/testdata/install-cni-plugin_default.golden generated vendored
View File

@ -119,7 +119,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.1.0 image: cr.l5d.io/linkerd/cni-plugin:v1.1.1
imagePullPolicy: imagePullPolicy:
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install-cni-plugin_fully_configured.golden generated vendored
View File

@ -120,7 +120,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: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.0 image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.1
imagePullPolicy: imagePullPolicy:
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden generated vendored
View File

@ -120,7 +120,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: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.0 image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.1
imagePullPolicy: imagePullPolicy:
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden generated vendored
View File

@ -120,7 +120,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: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.0 image: my-docker-registry.io/awesome/cni-plugin-test-image:v1.1.1
imagePullPolicy: imagePullPolicy:
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install-cni-plugin_skip_ports.golden generated vendored
View File

@ -120,7 +120,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.1.0 image: cr.l5d.io/linkerd/cni-plugin:v1.1.1
imagePullPolicy: imagePullPolicy:
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install_cni_helm_default_output.golden generated vendored
View File

@ -112,7 +112,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.1.0 image: cr.l5d.io/linkerd/cni-plugin:v1.1.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cli/cmd/testdata/install_cni_helm_override_output.golden generated vendored
View File

@ -113,7 +113,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.1.0 image: cr.l5d.io/linkerd/cni-plugin:v1.1.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR

2
cni-plugin/test/install-cni_test.go
View File

@ -147,7 +147,7 @@ func populateK8sCreds(wd string, tempK8sSvcAcctDir string, t *testing.T) {
// startDocker starts a test Docker container and runs the install-cni.sh script. // startDocker starts a test Docker container and runs the install-cni.sh script.
func startDocker(testNum int, wd string, testWorkRootDir string, tempCNINetDir string, tempCNIBinDir string, tempK8sSvcAcctDir string, t *testing.T) string { func startDocker(testNum int, wd string, testWorkRootDir string, tempCNINetDir string, tempCNIBinDir string, tempK8sSvcAcctDir string, t *testing.T) string {
dockerImage := env("HUB", "cr.l5d.io/linkerd") + "/cni-plugin:" + env("CNI_PLUGIN_VERSION", "v1.1.0") dockerImage := env("HUB", "cr.l5d.io/linkerd") + "/cni-plugin:" + env("CNI_PLUGIN_VERSION", "v1.1.1")
errFileName := testWorkRootDir + "/docker_run_stderr" errFileName := testWorkRootDir + "/docker_run_stderr"
// Build arguments list by picking whatever is necessary from the environment. // Build arguments list by picking whatever is necessary from the environment.

2
pkg/healthcheck/healthcheck_test.go
View File

@ -2422,7 +2422,7 @@ spec:
serviceAccountName: linkerd-cni serviceAccountName: linkerd-cni
containers: containers:
- name: install-cni - name: install-cni
image: cr.l5d.io/linkerd/cni-plugin:v1.1.0 image: cr.l5d.io/linkerd/cni-plugin:v1.1.1
env: env:
- name: DEST_CNI_NET_DIR - name: DEST_CNI_NET_DIR
valueFrom: valueFrom:

2
pkg/version/version.go
View File

@ -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.2.1" var ProxyInitVersion = "v2.2.1"
var LinkerdCNIVersion = "v1.1.0" var LinkerdCNIVersion = "v1.1.1"
const ( const (
// undefinedVersion should take the form `channel-version` to conform to // undefinedVersion should take the form `channel-version` to conform to