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

Upgrading proxy-init from v2.1.0 to v2.2.0 this time without JSON formatting (#10234) 

Signed-off-by: Steve Jenson <stevej@buoyant.io>
This commit is contained in:
Steve Jenson 2023-02-01 11:53:02 -08:00 committed by GitHub
parent 4873ca84f5
commit 1e8d96509b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,7 +240,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 | `"v2.1.0"` | Tag for the proxy-init container Docker image |
| proxyInit.image.version | string | `"v2.2.0"` | Tag for the proxy-init container Docker 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 |

2
charts/linkerd-control-plane/values.yaml
View File

@ -210,7 +210,7 @@ proxyInit:
# @default -- imagePullPolicy
pullPolicy: ""
# -- Tag for the proxy-init container Docker image
version: v2.1.0
version: v2.2.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

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

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

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

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

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

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

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

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

@ -178,7 +178,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -398,7 +398,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -618,7 +618,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -838,7 +838,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

2
cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

@ -195,7 +195,7 @@ spec:
- 4190,9998,7777,8888
- --outbound-ports-to-ignore
- "9999"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

2
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -179,7 +179,7 @@ spec:
- 4190,1234,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -180,7 +180,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

@ -180,7 +180,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -394,7 +394,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -180,7 +180,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -394,7 +394,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

@ -164,7 +164,7 @@ spec:
- 4190,4191,22,8100-8102
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_pod_with_requests.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject_emojivoto_statefulset.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:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -948,7 +948,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1399,7 +1399,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1732,7 +1732,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: my.custom.registry/linkerd-io/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: my.custom.registry/linkerd-io/proxy-init:v2.1.0
image: my.custom.registry/linkerd-io/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: my.custom.registry/linkerd-io/proxy-init:v2.1.0
image: my.custom.registry/linkerd-io/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: my.custom.registry/linkerd-io/proxy-init:v2.1.0
image: my.custom.registry/linkerd-io/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -945,7 +945,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1386,7 +1386,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1710,7 +1710,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -613,7 +613,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -1029,7 +1029,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1525,7 +1525,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1894,7 +1894,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -613,7 +613,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -1029,7 +1029,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1525,7 +1525,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1894,7 +1894,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -517,7 +517,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -878,7 +878,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1328,7 +1328,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1602,7 +1602,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "5432"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -586,7 +586,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.1.0
version: v2.2.0
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -947,7 +947,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1397,7 +1397,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.0
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1730,7 +1730,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "4567,4568"
image: cr.l5d.io/linkerd/proxy-init:v2.1.0
image: cr.l5d.io/linkerd/proxy-init:v2.2.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:v2.1.0",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.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:v2.1.0",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.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:v2.1.0",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.0",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

4
pkg/healthcheck/healthcheck_test.go
View File

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

2
pkg/healthcheck/sidecar_test.go
View File

@ -98,7 +98,7 @@ func TestHasExistingSidecars(t *testing.T) {
podSpec: &corev1.PodSpec{
InitContainers: []corev1.Container{
{
Image: "cr.l5d.io/linkerd/proxy-init:1.0.0",
Image: "cr.l5d.io/linkerd/proxy-init:2.2.0",
},
},
},

2
pkg/version/version.go
View File

@ -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.1.0"
var ProxyInitVersion = "v2.2.0"
const (
// undefinedVersion should take the form `channel-version` to conform to