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

Bump proxy-init to v1.6.2 (#8989) 

This change bumps the proxy-init version from v1.6.1 to the latest
version, v1.6.2. As part of the new release, proxy-init now adds
net_admin and net_raw sys caps to xtables-nft-multi so that nftables
mode can be used without requiring root privileges.

* Bump go.mod
* Bump version in helm values
* Bump version in misc files
* Bump version in code

Signed-off-by: Matei David <matei@buoyant.io>
This commit is contained in:
Matei David 2022-07-25 18:40:06 +03:00 committed by GitHub
parent c0d4bd6a26
commit 59734271d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 93 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/policy_controller.yml vendored
View File

@ -24,7 +24,7 @@ env:
CARGO_NET_RETRY: 10
K3D_VERSION: v5.4.3
PROTOC_NO_VENDOR: 1
PROXY_INIT_VERSION: v1.6.1
PROXY_INIT_VERSION: v1.6.2
RUST_BACKTRACE: short
RUSTUP_MAX_RETRIES: 10

2
charts/linkerd-control-plane/README.md
View File

@ -227,7 +227,7 @@ Kubernetes: `>=1.21.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.6.1"` | Tag for the proxy-init container Docker image |
| proxyInit.image.version | string | `"v1.6.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/linkerd-control-plane/values.yaml
View File

@ -196,7 +196,7 @@ proxyInit:
# @default -- imagePullPolicy
pullPolicy: ""
# -- Tag for the proxy-init container Docker image
version: v1.6.1
version: v1.6.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

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

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

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

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

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

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

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

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

@ -170,7 +170,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -379,7 +379,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -588,7 +588,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -797,7 +797,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

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

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

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

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

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

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

2
cli/cmd/testdata/inject_emojivoto_deployment_debug.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.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -172,7 +172,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -375,7 +375,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -172,7 +172,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -375,7 +375,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

2
cli/cmd/testdata/inject_emojivoto_pod_ingress.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.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -904,7 +904,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1319,7 +1319,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1620,7 +1620,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: my.custom.registry/linkerd-io/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.6.1
image: my.custom.registry/linkerd-io/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: my.custom.registry/linkerd-io/proxy-init:v1.6.1
image: my.custom.registry/linkerd-io/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: my.custom.registry/linkerd-io/proxy-init:v1.6.1
image: my.custom.registry/linkerd-io/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -901,7 +901,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1306,7 +1306,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1598,7 +1598,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -603,7 +603,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -985,7 +985,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1445,7 +1445,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1782,7 +1782,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -603,7 +603,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -985,7 +985,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1445,7 +1445,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1782,7 +1782,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -507,7 +507,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -834,7 +834,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1248,7 +1248,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1499,7 +1499,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -576,7 +576,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v1.6.1
version: v1.6.2
logFormat: ""
logLevel: ""
resources:
@ -903,7 +903,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1317,7 +1317,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1618,7 +1618,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v1.6.1
image: cr.l5d.io/linkerd/proxy-init:v1.6.2
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

2
go.mod
View File

@ -21,7 +21,7 @@ require (
github.com/imdario/mergo v0.3.13
github.com/julienschmidt/httprouter v1.3.0
github.com/linkerd/linkerd2-proxy-api v0.6.0
github.com/linkerd/linkerd2-proxy-init v1.6.1
github.com/linkerd/linkerd2-proxy-init v1.6.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

@ -646,6 +646,8 @@ github.com/linkerd/linkerd2-proxy-api v0.6.0 h1:oeJMxEGAfB2gJSs3TdzL+Efbiz+i5Zhr
github.com/linkerd/linkerd2-proxy-api v0.6.0/go.mod h1:kiFDmEXotfjhIz3lGOa/EyQ13phLMDtmvU9VuE3kAYc=
github.com/linkerd/linkerd2-proxy-init v1.6.1 h1:zrnqN5qnzPni0CE5eHXU258FORkqhU9ocKmCFBLGT90=
github.com/linkerd/linkerd2-proxy-init v1.6.1/go.mod h1:qmQcEqgaXU7iUPjzEuLyUXdYs/C1co0IqXEmmUPtcy4=
github.com/linkerd/linkerd2-proxy-init v1.6.2 h1:hSB2rUsEf/wHYnHCA4JC4DgRKYYKiDEXnKhKub0RTvo=
github.com/linkerd/linkerd2-proxy-init v1.6.2/go.mod h1:lHCNCzP6xCajRTNIiYX6oWcs8KbAph2Z2zUFgFtVHkw=
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=

4
pkg/healthcheck/healthcheck_test.go
View File

@ -1746,7 +1746,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.6.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.6.2","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |
@ -1899,7 +1899,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.6.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.6.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.6.1"
var ProxyInitVersion = "v1.6.2"
const (
// undefinedVersion should take the form `channel-version` to conform to