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 v2.2.4 (#11988) 

Upgraded Alpine to 3.19.0, and other various dependencies bumps.
This commit is contained in:
Alejandro Pedraza 2024-01-26 12:28:14 -05:00 committed by GitHub
parent 0261e4f086
commit 796bb85323
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
48 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE.md
View File

@ -32,7 +32,7 @@ release (which is rare), the following updates are needed:
- `pkg/version/version.go` (this also implies changes in unit test fixtures)
```go
var ProxyInitVersion = "v2.2.3"
var ProxyInitVersion = "v2.2.4"
var LinkerdCNIVersion = "v1.3.0"
```

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

@ -270,7 +270,7 @@ Kubernetes: `>=1.22.0-0`
| proxyInit.ignoreOutboundPorts | string | `"4567,4568"` | Default set of outbound ports to skip via iptables - Galera (4567,4568) |
| proxyInit.image.name | string | `"cr.l5d.io/linkerd/proxy-init"` | Docker image for the proxy-init container |
| proxyInit.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy-init container image |
| proxyInit.image.version | string | `"v2.2.3"` | Tag for the proxy-init container image |
| proxyInit.image.version | string | `"v2.2.4"` | Tag for the proxy-init container image |
| proxyInit.iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing. Currently, proxy-init can be run either in 'nft' or in 'legacy' mode. The mode will control which utility binary will be called. The host must support whichever mode will be used |
| proxyInit.kubeAPIServerPorts | string | `"443,6443"` | Default set of ports to skip via iptables for control plane components so they can communicate with the Kubernetes API Server |
| proxyInit.logFormat | string | plain | Log format (`plain` or `json`) for the proxy-init |

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

@ -250,7 +250,7 @@ proxyInit:
# @default -- imagePullPolicy
pullPolicy: ""
# -- Tag for the proxy-init container image
version: v2.2.3
version: v2.2.4
resources:
cpu:
# -- Maximum amount of CPU units that the proxy-init container can use

2
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml 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.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml 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.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -400,7 +400,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

2
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml 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.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

@ -190,7 +190,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -422,7 +422,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -654,7 +654,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -886,7 +886,7 @@ spec:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -192,7 +192,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -418,7 +418,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -192,7 +192,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -418,7 +418,7 @@ items:
- 4190,4191,4567,4568
- --outbound-ports-to-ignore
- 4567,4568
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

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

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

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

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

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

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

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

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

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

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

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1071,7 +1071,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1260,7 +1260,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1540,7 +1540,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1694,7 +1694,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1888,7 +1888,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: my.custom.registry/linkerd-io/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: my.custom.registry/linkerd-io/proxy-init:v2.2.3
image: my.custom.registry/linkerd-io/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: my.custom.registry/linkerd-io/proxy-init:v2.2.3
image: my.custom.registry/linkerd-io/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: my.custom.registry/linkerd-io/proxy-init:v2.2.3
image: my.custom.registry/linkerd-io/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1068,7 +1068,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1250,7 +1250,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1527,7 +1527,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1674,7 +1674,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1866,7 +1866,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -722,7 +722,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -1152,7 +1152,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1666,7 +1666,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2050,7 +2050,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -722,7 +722,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -1152,7 +1152,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1666,7 +1666,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -2050,7 +2050,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -626,7 +626,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -806,7 +806,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1001,7 +1001,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1190,7 +1190,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1469,7 +1469,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1563,7 +1563,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1757,7 +1757,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1253,7 +1253,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1680,7 +1680,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,22,8100-8102"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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

@ -695,7 +695,7 @@ data:
image:
name: cr.l5d.io/linkerd/proxy-init
pullPolicy: ""
version: v2.2.3
version: v2.2.4
iptablesMode: legacy
kubeAPIServerPorts: 443,6443
logFormat: ""
@ -875,7 +875,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- args:
- identity
@ -1070,7 +1070,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1259,7 +1259,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1538,7 +1538,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:
@ -1692,7 +1692,7 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
containers:
- env:
- name: _pod_name
@ -1886,7 +1886,7 @@ spec:
- "4190,4191,4567,4568"
- --outbound-ports-to-ignore
- "443,6443"
image: cr.l5d.io/linkerd/proxy-init:v2.2.3
image: cr.l5d.io/linkerd/proxy-init:v2.2.4
imagePullPolicy: IfNotPresent
name: linkerd-init
resources:

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.2.3",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.4",
"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.2.3",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.4",
"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.2.3",
"image": "cr.l5d.io/linkerd/proxy-init:v2.2.4",
"imagePullPolicy": "IfNotPresent",
"name": "linkerd-init",
"resources": {

4
pkg/healthcheck/healthcheck_test.go
View File

@ -1837,7 +1837,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}}
proxy: |
{"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.3","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.4","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |
@ -1990,7 +1990,7 @@ data:
global: |
{"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}}
proxy: |
{"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.3","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
{"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.2.4","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"}
install: |
{"cliVersion":"dev-undefined","flags":[]}
values: |

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.2.3"
var ProxyInitVersion = "v2.2.4"
var LinkerdCNIVersion = "v1.3.0"
const (