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

Update `proxy-init` to `v1.5.2` (#7447) 

New proxy init version adds the option to skip subnets 
from being redirected to the inbound proxy port.

Signed-off-by: Matei David <matei@buoyant.io>
This commit is contained in:
Matei David 2021-12-09 15:31:55 +00:00 committed by GitHub
parent 84b78020b5
commit ebe125df6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 91 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2/README.md
View File

@ -210,7 +210,7 @@ Kubernetes: `>=1.20.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 Docker image |
| proxyInit.image.version | string | `"v1.5.1"` | Tag for the proxy-init container Docker image |
| proxyInit.image.version | string | `"v1.5.2"` | Tag for the proxy-init container Docker image |
| proxyInit.logFormat | string | plain | Log format (`plain` or `json`) for the proxy-init |
| proxyInit.logLevel | string | info | Log level for the proxy-init |
| proxyInit.resources.cpu.limit | string | `"100m"` | Maximum amount of CPU units that the proxy-init container can use |

2
charts/linkerd2/values.yaml
View File

@ -180,7 +180,7 @@ proxyInit:
# @default -- imagePullPolicy
pullPolicy: ""
# -- Tag for the proxy-init container Docker image
version: v1.5.1
version: v1.5.2
resources:
cpu:
# -- Maximum amount of CPU units that the proxy-init container can use

2
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml vendored
View File

@ -163,7 +163,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml vendored
View File

@ -163,7 +163,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -365,7 +365,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml vendored
View File

@ -163,7 +163,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_contour.golden.yml generated vendored
View File

@ -203,7 +203,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml generated vendored
View File

@ -174,7 +174,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -387,7 +387,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -600,7 +600,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -813,7 +813,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment.golden.yml generated vendored
View File

@ -174,7 +174,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml generated vendored
View File

@ -166,7 +166,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml generated vendored
View File

@ -187,7 +187,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml generated vendored
View File

@ -191,7 +191,7 @@ spec:
- 4190,9998,7777,8888
- --outbound-ports-to-ignore
- "9999"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml generated vendored
View File

@ -174,7 +174,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -387,7 +387,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml generated vendored
View File

@ -179,7 +179,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml generated vendored
View File

@ -174,7 +174,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml generated vendored
View File

@ -175,7 +175,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml generated vendored
View File

@ -175,7 +175,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml generated vendored
View File

@ -175,7 +175,7 @@ spec:
- 4190,1234,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml generated vendored
View File

@ -176,7 +176,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml generated vendored
View File

@ -176,7 +176,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject_emojivoto_list.golden.yml generated vendored
View File

@ -176,7 +176,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -383,7 +383,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml generated vendored
View File

@ -176,7 +176,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -383,7 +383,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod.golden.yml generated vendored
View File

@ -157,7 +157,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml generated vendored
View File

@ -160,7 +160,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml generated vendored
View File

@ -159,7 +159,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml generated vendored
View File

@ -168,7 +168,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml generated vendored
View File

@ -175,7 +175,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject_gettest_deployment.good.golden.yml generated vendored
View File

@ -176,7 +176,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -391,7 +391,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_tap_deployment.input.yml vendored
View File

@ -203,7 +203,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568,443
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_tap_deployment_debug.golden.yml generated vendored
View File

@ -228,7 +228,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1608,7 +1608,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2015,7 +2015,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2311,7 +2311,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1607,7 +1607,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2013,7 +2013,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2309,7 +2309,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: my.custom.registry/linkerd-io/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1607,7 +1607,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.5.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2013,7 +2013,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.5.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2309,7 +2309,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: my.custom.registry/linkerd-io/proxy-init:v1.5.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1607,7 +1607,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2013,7 +2013,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2309,7 +2309,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1607,7 +1607,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2013,7 +2013,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2309,7 +2309,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1605,7 +1605,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2002,7 +2002,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2289,7 +2289,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -1318,7 +1318,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1693,7 +1693,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2149,7 +2149,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2485,7 +2485,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -1318,7 +1318,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1693,7 +1693,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2149,7 +2149,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2485,7 +2485,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -1222,7 +1222,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1944,7 +1944,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2191,7 +2191,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:

8
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -1291,7 +1291,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1607,7 +1607,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2013,7 +2013,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2309,7 +2309,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

8
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -1277,7 +1277,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.5.1
version: v1.5.2
logFormat: ""
logLevel: ""
resources:
@ -1593,7 +1593,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1999,7 +1999,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2295,7 +2295,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.5.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
controller/proxy-injector/fake/data/pod-with-debug.patch.json generated
View File

@ -58,7 +58,7 @@
"--outbound-ports-to-ignore",
"4567,4568"
],
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.2",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json generated
View File

@ -68,7 +68,7 @@
"--outbound-ports-to-ignore",
"34567"
],
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.2",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
controller/proxy-injector/fake/data/pod.patch.json generated
View File

@ -58,7 +58,7 @@
"--outbound-ports-to-ignore",
"4567,4568"
],
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.2",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
go.mod
View File

@ -20,7 +20,7 @@ require (
github.com/imdario/mergo v0.3.12
github.com/julienschmidt/httprouter v1.3.0
github.com/linkerd/linkerd2-proxy-api v0.3.0
github.com/linkerd/linkerd2-proxy-init v1.5.1
github.com/linkerd/linkerd2-proxy-init v1.5.2
github.com/mattn/go-isatty v0.0.14
github.com/mattn/go-runewidth v0.0.13
github.com/nsf/termbox-go v0.0.0-20180613055208-5c94acc5e6eb

2
go.sum
View File

@ -636,6 +636,8 @@ github.com/linkerd/linkerd2-proxy-api v0.3.0 h1:TUfIw+XffDQQ3SQEJcIiHnZgZZxKK/Zf
github.com/linkerd/linkerd2-proxy-api v0.3.0/go.mod h1:BuA+jXhgCXiBJkNjQrA9h1PLsJN5z6NOYJI5KVYDc2U=
github.com/linkerd/linkerd2-proxy-init v1.5.1 h1:eE+hVvLJqyQbLYhG61yeOOs5ASc71cMXYuXcPNXPmS8=
github.com/linkerd/linkerd2-proxy-init v1.5.1/go.mod h1:pbWWdLASP+FKBZ61rvCMx6nvHAP2nc1bhGUhhh8gY/k=
github.com/linkerd/linkerd2-proxy-init v1.5.2 h1:haasRTIzDGbjbMRhY0RwQRbWn1b1VqymGwiy38xwpzY=
github.com/linkerd/linkerd2-proxy-init v1.5.2/go.mod h1:aBd7DEKESAVQR+9rZ1Oz9wgGFaCME1F9Dm3XCD1pqUY=
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

4
pkg/healthcheck/healthcheck_test.go
View File

@ -2191,7 +2191,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":"v1.5.1","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":"v1.5.2","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |
@ -2351,7 +2351,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":"v1.5.1","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":"v1.5.2","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |

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 with the constraint version for
// github.com/linkerd/linkerd2-proxy-init in /go.mod
var ProxyInitVersion = "v1.5.1"
var ProxyInitVersion = "v1.5.2"
const (
// undefinedVersion should take the form `channel-version` to conform to