Upgrade to proxy-init:v2.3.0 and linkerd-cni:1.4.0 (#12361)

Author: alpeb

RELEASE.md

@@ -32,8 +32,8 @@ release (which is rare), the following updates are needed:
 - `pkg/version/version.go` (this also implies changes in unit test fixtures)
 
    ```go
-   var ProxyInitVersion = "v2.2.4"
-   var LinkerdCNIVersion = "v1.3.0"
+   var ProxyInitVersion = "v2.3.0"
+   var LinkerdCNIVersion = "v1.4.0"
    ```
 
 - `charts/linkerd-control-plane/values.yaml`

charts/linkerd-control-plane/README.md

@@ -271,7 +271,7 @@ Kubernetes: `>=1.22.0-0`
 | proxyInit.ignoreOutboundPorts | string | `"4567,4568"` | Default set of outbound ports to skip via iptables - Galera (4567,4568) |
 | proxyInit.image.name | string | `"cr.l5d.io/linkerd/proxy-init"` | Docker image for the proxy-init container |
 | proxyInit.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy-init container image |
-| proxyInit.image.version | string | `"v2.2.4"` | Tag for the proxy-init container image |
+| proxyInit.image.version | string | `"v2.3.0"` | Tag for the proxy-init container image |
 | proxyInit.iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing. Currently, proxy-init can be run either in 'nft' or in 'legacy' mode. The mode will control which utility binary will be called. The host must support whichever mode will be used |
 | proxyInit.kubeAPIServerPorts | string | `"443,6443"` | Default set of ports to skip via iptables for control plane components so they can communicate with the Kubernetes API Server |
 | proxyInit.logFormat | string | plain | Log format (`plain` or `json`) for the proxy-init |

charts/linkerd-control-plane/values.yaml

@@ -265,7 +265,7 @@ proxyInit:
     # @default -- imagePullPolicy
     pullPolicy: ""
     # -- Tag for the proxy-init container image
-    version: v2.2.4
+    version: v2.3.0
   resources:
     cpu:
       # -- Maximum amount of CPU units that the proxy-init container can use

charts/linkerd2-cni/README.md

@@ -31,7 +31,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.3.0"` | Tag for the CNI container Docker image |
+| image.version | string | `"v1.4.0"` | Tag for the CNI container Docker image |
 | imagePullSecrets | list | `[]` |  |
 | inboundProxyPort | int | `4143` | Inbound port for the proxy container |
 | logLevel | string | `"info"` | Log level for the CNI plugin |

charts/linkerd2-cni/values.yaml

@@ -53,7 +53,7 @@ image:
   # -- Docker image for the CNI plugin
   name: "cr.l5d.io/linkerd/cni-plugin"
   # -- Tag for the CNI container Docker image
-  version: "v1.3.0"
+  version: "v1.4.0"
   # -- Pull policy for the linkerd-cni container
   pullPolicy: IfNotPresent
 

cli/cmd/install-cni-plugin_test.go

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

cli/cmd/install_cni_helm_test.go

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

cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml

@@ -181,7 +181,7 @@ spec:
         - 4190,4191,4567,4568
         - --outbound-ports-to-ignore
         - 4567,4568
-        image: cr.l5d.io/linkerd/proxy-init:v2.2.4
+        image: cr.l5d.io/linkerd/proxy-init:v2.3.0
         imagePullPolicy: IfNotPresent
         name: linkerd-init
         resources:

cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml

@@ -181,7 +181,7 @@ spec:
         - 4190,4191,4567,4568
         - --outbound-ports-to-ignore
         - 4567,4568
-        image: cr.l5d.io/linkerd/proxy-init:v2.2.4
+        image: cr.l5d.io/linkerd/proxy-init:v2.3.0
         imagePullPolicy: IfNotPresent
         name: linkerd-init
         resources:
@@ -404,7 +404,7 @@ spec:
         - 4190,4191,4567,4568
         - --outbound-ports-to-ignore
         - 4567,4568
-        image: cr.l5d.io/linkerd/proxy-init:v2.2.4
+        image: cr.l5d.io/linkerd/proxy-init:v2.3.0
         imagePullPolicy: IfNotPresent
         name: linkerd-init
         resources:

cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml

@@ -181,7 +181,7 @@ spec:
         - 4190,4191,4567,4568
         - --outbound-ports-to-ignore
         - 4567,4568
-        image: cr.l5d.io/linkerd/proxy-init:v2.2.4
+        image: cr.l5d.io/linkerd/proxy-init:v2.3.0
         imagePullPolicy: IfNotPresent
         name: linkerd-init
         resources: