diff --git a/RELEASE.md b/RELEASE.md index d37a42934179c..295c42568d14e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -32,7 +32,7 @@ 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.3" + var ProxyInitVersion = "v2.2.4" var LinkerdCNIVersion = "v1.3.0" ``` diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 7608863262bb3..ba91dbb635ec0 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -270,7 +270,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.3"` | Tag for the proxy-init container image | +| proxyInit.image.version | string | `"v2.2.4"` | 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 | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index 54e7522d68f47..a55e0e112ef7f 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -250,7 +250,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container image - version: v2.2.3 + version: v2.2.4 resources: cpu: # -- Maximum amount of CPU units that the proxy-init container can use diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 9bc0046a54ac4..8c73ee2d1ab80 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml index 07082ef7ca684..f027cd05f38d6 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -400,7 +400,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index 6189f2c7c63f9..4c8e6508c3c40 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index feb5bf0a3f3da..2bc0bbeba0999 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -219,7 +219,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index 14fb09d5bf7a5..ed8c472ff0c71 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -190,7 +190,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -422,7 +422,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -654,7 +654,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -886,7 +886,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 5514fd7bd060f..8d6d2cd8f9064 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -190,7 +190,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index f182758d346c1..2d19109301227 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -193,7 +193,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index 68284055b9f4d..54230bf14c15e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -182,7 +182,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index 96453c487cdca..2cc06019b4698 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml index 906a3eb1582aa..7fabf34ef0f8c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -207,7 +207,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml index b0fe70665a1b2..f33b72be02b6a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -190,7 +190,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -422,7 +422,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index eff5e403ef5b8..ab90e32068125 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml index 18f012f50f85b..baa852a0b9c6b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -190,7 +190,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml index b16d3ffb687e4..b54f922fdbc2c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index 9e048e52ca981..70f7123c4cefa 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -48,7 +48,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index ab78b5565616a..e342f7d114b94 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index c7c3f9b83f52a..b64ac6a5d40c3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index f1ef019567afd..0ab74c7ae71a0 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 4ec14b28f5ce7..d82b9a30bf928 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index eab9da1e4cec8..95a7c78ab5dfc 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -192,7 +192,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -418,7 +418,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml index ce1e32e04ce16..502acec776773 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -192,7 +192,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -418,7 +418,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 25420d6010839..925a751c84f7d 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -174,7 +174,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 91ad3e7d8288c..ba2f55fba9e52 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -177,7 +177,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index c3dc4db68b99d..5fe38a016ffb7 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -176,7 +176,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml index 819799c3cbd17..7d2d99d40297f 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -185,7 +185,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 93cdaf438a992..7f42a8d80cc87 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index da2d9cd12e179..8a95018d8d733 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -426,7 +426,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index e6d0966c76c41..39443c24fe3e3 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -252,7 +252,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 75f20491fbd1a..8ca7699735ab4 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1071,7 +1071,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1260,7 +1260,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1540,7 +1540,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1694,7 +1694,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1888,7 +1888,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 8324a574bde8e..ccd6299e8e6d5 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 48f10e6bf5c87..f917e336262f4 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -695,7 +695,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.3 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.3 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.2.3 + image: my.custom.registry/linkerd-io/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 8324a574bde8e..ccd6299e8e6d5 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 37952cbe8eee8..c6e4b576f98f4 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index ec0d8aa40f898..c3b0f46d382d4 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1068,7 +1068,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1250,7 +1250,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1527,7 +1527,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1674,7 +1674,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1866,7 +1866,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 49303684ac829..d78d4c4cc0262 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -722,7 +722,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1152,7 +1152,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1666,7 +1666,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2050,7 +2050,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 684aa2e1ed48d..bfe7d7382db9f 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -722,7 +722,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1152,7 +1152,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1666,7 +1666,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2050,7 +2050,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 91bab1d2144b2..635a693b79279 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -626,7 +626,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -806,7 +806,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1001,7 +1001,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1190,7 +1190,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1469,7 +1469,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1563,7 +1563,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1757,7 +1757,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 251150fa7c87c..edf1cfd6e608f 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1253,7 +1253,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1680,7 +1680,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index c6ec681a44de5..46b30f3564a7b 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index bab001a8798a7..cdac81c9c2f8a 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -695,7 +695,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.2.3 + version: v2.2.4 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -875,7 +875,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1070,7 +1070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1259,7 +1259,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1538,7 +1538,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1692,7 +1692,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1886,7 +1886,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.2.3 + image: cr.l5d.io/linkerd/proxy-init:v2.2.4 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index fe8ec5de34564..b1924d369c9b0 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.2.3", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.4", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index 94010ed723d62..f89b024244afe 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -68,7 +68,7 @@ "--outbound-ports-to-ignore", "34567" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.2.3", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.4", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index ad43f6e5d54dd..ba7ca42f884d7 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.2.3", + "image": "cr.l5d.io/linkerd/proxy-init:v2.2.4", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index e8e647a65812a..4a6205572be66 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -1837,7 +1837,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.3","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.4","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | @@ -1990,7 +1990,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.3","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.4","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | diff --git a/pkg/version/version.go b/pkg/version/version.go index 96e15e21e7f85..503897705382a 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -15,7 +15,7 @@ var Version = undefinedVersion // ProxyInitVersion is the pinned version of the proxy-init, from // 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.2.3" +var ProxyInitVersion = "v2.2.4" var LinkerdCNIVersion = "v1.3.0" const (