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

Upgrade proxy-init to v1.5.0 (#7203) 

To include the changes from linkerd/linkerd2-proxy-init#49 (allow the
proxy-init image to be run as non-root)
This commit is contained in:
Alejandro Pedraza 2021-11-03 14:35:58 -05:00 committed by GitHub
parent 2d36e8fd42
commit 281cc4aded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/linkerd2/README.md
View File

@ -206,7 +206,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.4.1"` | Tag for the proxy-init container Docker image |
| proxyInit.image.version | string | `"v1.5.0"` | Tag for the proxy-init container Docker image |
| proxyInit.resources.cpu.limit | string | `"100m"` | Maximum amount of CPU units that the proxy-init container can use |
| proxyInit.resources.cpu.request | string | `"10m"` | Amount of CPU units that the proxy-init container requests |
| proxyInit.resources.memory.limit | string | `"50Mi"` | Maximum amount of memory that the proxy-init container can use |

2
charts/linkerd2/values.yaml
View File

@ -164,7 +164,7 @@ proxyInit:
# @default -- imagePullPolicy
pullPolicy: ""
# -- Tag for the proxy-init container Docker image
version: v1.4.1
version: v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -366,7 +366,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -388,7 +388,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -602,7 +602,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -816,7 +816,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -388,7 +388,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -384,7 +384,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -384,7 +384,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -392,7 +392,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1687,7 +1687,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2094,7 +2094,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2391,7 +2391,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1686,7 +1686,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2092,7 +2092,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2389,7 +2389,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: my.custom.registry/linkerd-io/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1686,7 +1686,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2092,7 +2092,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2389,7 +2389,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: my.custom.registry/linkerd-io/proxy-init:v1.4.1
image: my.custom.registry/linkerd-io/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1686,7 +1686,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2092,7 +2092,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2389,7 +2389,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1686,7 +1686,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2092,7 +2092,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2389,7 +2389,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1394,7 +1394,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1760,7 +1760,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2216,7 +2216,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2553,7 +2553,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1394,7 +1394,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1760,7 +1760,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2216,7 +2216,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2553,7 +2553,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1307,7 +1307,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1617,7 +1617,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2023,7 +2023,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2271,7 +2271,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m

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

@ -1376,7 +1376,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1686,7 +1686,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2092,7 +2092,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2389,7 +2389,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -1362,7 +1362,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.4.1
version: v1.5.0
resources:
cpu:
limit: 100m
@ -1672,7 +1672,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2078,7 +2078,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2375,7 +2375,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.4.1
image: cr.l5d.io/linkerd/proxy-init:v1.5.0
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.4.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.0",
"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.4.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.0",
"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.4.1",
"image": "cr.l5d.io/linkerd/proxy-init:v1.5.0",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

2
go.mod
View File

@ -21,7 +21,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.4.1
github.com/linkerd/linkerd2-proxy-init v1.5.0
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

4
go.sum
View File

@ -580,8 +580,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/linkerd/linkerd2-proxy-api v0.3.0 h1:TUfIw+XffDQQ3SQEJcIiHnZgZZxKK/ZfsVx7SeZH2nM=
github.com/linkerd/linkerd2-proxy-api v0.3.0/go.mod h1:BuA+jXhgCXiBJkNjQrA9h1PLsJN5z6NOYJI5KVYDc2U=
github.com/linkerd/linkerd2-proxy-init v1.4.1 h1:SMzGss09bisWOb67Qh6x9U0UkDmPde4eXf17rVOx/PM=
github.com/linkerd/linkerd2-proxy-init v1.4.1/go.mod h1:pbWWdLASP+FKBZ61rvCMx6nvHAP2nc1bhGUhhh8gY/k=
github.com/linkerd/linkerd2-proxy-init v1.5.0 h1:Dr6oU5/mbVOPQbmPLffA25R+yrwxpINW8aIu1IaV+QY=
github.com/linkerd/linkerd2-proxy-init v1.5.0/go.mod h1:pbWWdLASP+FKBZ61rvCMx6nvHAP2nc1bhGUhhh8gY/k=
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

8
pkg/healthcheck/healthcheck_test.go
View File

@ -2187,7 +2187,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.4.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.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}`,
},
@ -2233,7 +2233,7 @@ data:
},
DisableExternalProfiles: true,
ProxyVersion: "install-proxy-version",
ProxyInitImageVersion: "v1.4.1",
ProxyInitImageVersion: "v1.5.0",
DebugImage: &configPb.Image{
ImageName: "cr.l5d.io/linkerd/debug",
PullPolicy: "IfNotPresent",
@ -2325,7 +2325,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.4.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.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |
@ -2485,7 +2485,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.4.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.0","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.4.1"
var ProxyInitVersion = "v1.5.0"
const (
// undefinedVersion should take the form `channel-version` to conform to