diff --git a/charts/linkerd2/README.md b/charts/linkerd2/README.md index 8af4abc9a..2142f0fb0 100644 --- a/charts/linkerd2/README.md +++ b/charts/linkerd2/README.md @@ -206,7 +206,7 @@ Kubernetes: `>=1.20.0-0` | proxyInit.ignoreOutboundPorts | string | `"4567,4568"` | Default set of outbound ports to skip via iptables - Galera (4567,4568) | | proxyInit.image.name | string | `"cr.l5d.io/linkerd/proxy-init"` | Docker image for the proxy-init container | | proxyInit.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy-init container Docker image | -| proxyInit.image.version | string | `"v1.4.1"` | Tag for the proxy-init container Docker image | +| proxyInit.image.version | string | `"v1.5.0"` | Tag for the proxy-init container Docker image | | proxyInit.resources.cpu.limit | string | `"100m"` | Maximum amount of CPU units that the proxy-init container can use | | proxyInit.resources.cpu.request | string | `"10m"` | Amount of CPU units that the proxy-init container requests | | proxyInit.resources.memory.limit | string | `"50Mi"` | Maximum amount of memory that the proxy-init container can use | diff --git a/charts/linkerd2/values.yaml b/charts/linkerd2/values.yaml index 33929ea78..37dd60c56 100644 --- a/charts/linkerd2/values.yaml +++ b/charts/linkerd2/values.yaml @@ -164,7 +164,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container Docker image - version: v1.4.1 + version: v1.5.0 resources: cpu: # -- Maximum amount of CPU units that the proxy-init container can use diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 50d5248dd..f06a87086 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -163,7 +163,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml index d1511194a..a826387a5 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -163,7 +163,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -366,7 +366,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index af3b86d35..a0ace4d43 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -163,7 +163,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 6bac32874..235b79cf7 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index b753c406a..2c9da60cf 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -174,7 +174,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -388,7 +388,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -602,7 +602,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -816,7 +816,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 102cdea5e..b28aa5048 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -174,7 +174,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index b480cd1a8..cded769a3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -187,7 +187,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml index a9e6e8f22..43bb6ceda 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -191,7 +191,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml index 7244d4ed2..d65aef613 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -174,7 +174,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -388,7 +388,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index cbf61d31a..df895f9b3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml index 954effd24..2e001de82 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -174,7 +174,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml index 3f9755338..a9d4011f4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -175,7 +175,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index 5da140aaa..98c703577 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -175,7 +175,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index d63ab96df..322ea4bb9 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -175,7 +175,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index 28fe212bb..e7140297b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -176,7 +176,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 58c8f390a..b8efd96fd 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -176,7 +176,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 4a122b752..c98fd7a70 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -176,7 +176,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -384,7 +384,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml index 6f8603de2..db2be4cfa 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -176,7 +176,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -384,7 +384,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 067495433..336eea6dd 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -157,7 +157,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 3ca7d3697..96b667273 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -160,7 +160,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 91a93e3ca..aed46b8e9 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -159,7 +159,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml index e7313d32a..b18148a81 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -168,7 +168,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 3a6c095fe..e86a0193f 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -175,7 +175,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index 2245131a4..f11169d87 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -176,7 +176,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -392,7 +392,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_tap_deployment.input.yml b/cli/cmd/testdata/inject_tap_deployment.input.yml index 8167abe68..1f78130b9 100644 --- a/cli/cmd/testdata/inject_tap_deployment.input.yml +++ b/cli/cmd/testdata/inject_tap_deployment.input.yml @@ -203,7 +203,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568,443 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index de3a6d9b9..c1379872e 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -228,7 +228,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index ed2e195fc..180bb2d96 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1687,7 +1687,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2094,7 +2094,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2391,7 +2391,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index b92683e64..b0f764609 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1686,7 +1686,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2092,7 +2092,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2389,7 +2389,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index e46f4d350..47c18339d 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -1376,7 +1376,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1686,7 +1686,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: my.custom.registry/linkerd-io/proxy-init:v1.4.1 + image: my.custom.registry/linkerd-io/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2092,7 +2092,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: my.custom.registry/linkerd-io/proxy-init:v1.4.1 + image: my.custom.registry/linkerd-io/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2389,7 +2389,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: my.custom.registry/linkerd-io/proxy-init:v1.4.1 + image: my.custom.registry/linkerd-io/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index d4ff67f34..395f2558f 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1686,7 +1686,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2092,7 +2092,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2389,7 +2389,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 46bbe6e04..d08317251 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1686,7 +1686,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2092,7 +2092,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2389,7 +2389,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 4fb032c23..9432fa199 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -1394,7 +1394,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1760,7 +1760,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2216,7 +2216,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2553,7 +2553,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index fd61baabc..558223932 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -1394,7 +1394,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1760,7 +1760,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2216,7 +2216,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2553,7 +2553,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 9dbeb66a0..4a6703376 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -1307,7 +1307,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1617,7 +1617,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2023,7 +2023,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2271,7 +2271,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 48f3e15dd..e881f09d3 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index f92b2a1c8..507100582 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -1376,7 +1376,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1686,7 +1686,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2092,7 +2092,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2389,7 +2389,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 162c03ad6..368934d5c 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -1362,7 +1362,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v1.4.1 + version: v1.5.0 resources: cpu: limit: 100m @@ -1672,7 +1672,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2078,7 +2078,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2375,7 +2375,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "4567,4568" - image: cr.l5d.io/linkerd/proxy-init:v1.4.1 + image: cr.l5d.io/linkerd/proxy-init:v1.5.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index 8b2b9469f..613f8aff2 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v1.4.1", + "image": "cr.l5d.io/linkerd/proxy-init:v1.5.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index 77dbc16d4..18cdf81b7 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -68,7 +68,7 @@ "--outbound-ports-to-ignore", "34567" ], - "image": "cr.l5d.io/linkerd/proxy-init:v1.4.1", + "image": "cr.l5d.io/linkerd/proxy-init:v1.5.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 0177b6d68..c54e08870 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -58,7 +58,7 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v1.4.1", + "image": "cr.l5d.io/linkerd/proxy-init:v1.5.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/go.mod b/go.mod index b8b25bcf2..ce777d55f 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/imdario/mergo v0.3.12 github.com/julienschmidt/httprouter v1.3.0 github.com/linkerd/linkerd2-proxy-api v0.3.0 - github.com/linkerd/linkerd2-proxy-init v1.4.1 + github.com/linkerd/linkerd2-proxy-init v1.5.0 github.com/mattn/go-isatty v0.0.14 github.com/mattn/go-runewidth v0.0.13 github.com/nsf/termbox-go v0.0.0-20180613055208-5c94acc5e6eb diff --git a/go.sum b/go.sum index ba648168d..3bde294fc 100644 --- a/go.sum +++ b/go.sum @@ -580,8 +580,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linkerd/linkerd2-proxy-api v0.3.0 h1:TUfIw+XffDQQ3SQEJcIiHnZgZZxKK/ZfsVx7SeZH2nM= github.com/linkerd/linkerd2-proxy-api v0.3.0/go.mod h1:BuA+jXhgCXiBJkNjQrA9h1PLsJN5z6NOYJI5KVYDc2U= -github.com/linkerd/linkerd2-proxy-init v1.4.1 h1:SMzGss09bisWOb67Qh6x9U0UkDmPde4eXf17rVOx/PM= -github.com/linkerd/linkerd2-proxy-init v1.4.1/go.mod h1:pbWWdLASP+FKBZ61rvCMx6nvHAP2nc1bhGUhhh8gY/k= +github.com/linkerd/linkerd2-proxy-init v1.5.0 h1:Dr6oU5/mbVOPQbmPLffA25R+yrwxpINW8aIu1IaV+QY= +github.com/linkerd/linkerd2-proxy-init v1.5.0/go.mod h1:pbWWdLASP+FKBZ61rvCMx6nvHAP2nc1bhGUhhh8gY/k= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index ba8f85707..e61c8500a 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -2187,7 +2187,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.4.1","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.5.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]}`, }, @@ -2233,7 +2233,7 @@ data: }, DisableExternalProfiles: true, ProxyVersion: "install-proxy-version", - ProxyInitImageVersion: "v1.4.1", + ProxyInitImageVersion: "v1.5.0", DebugImage: &configPb.Image{ ImageName: "cr.l5d.io/linkerd/debug", PullPolicy: "IfNotPresent", @@ -2325,7 +2325,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.4.1","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.5.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | @@ -2485,7 +2485,7 @@ data: global: | {"linkerdNamespace":"linkerd","cniEnabled":false,"version":"install-control-plane-version","identityContext":{"trustDomain":"cluster.local","trustAnchorsPem":"fake-trust-anchors-pem","issuanceLifetime":"86400s","clockSkewAllowance":"20s"}} proxy: | - {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.4.1","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"proxyInitImage":{"imageName":"cr.l5d.io/linkerd/proxy-init","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v1.5.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | diff --git a/pkg/version/version.go b/pkg/version/version.go index 913df62dd..e80280e9e 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -16,7 +16,7 @@ var Version = undefinedVersion // https://github.com/linkerd/linkerd2-proxy-init // This has to be kept in sync with the constraint version for // github.com/linkerd/linkerd2-proxy-init in /go.mod -var ProxyInitVersion = "v1.4.1" +var ProxyInitVersion = "v1.5.0" const ( // undefinedVersion should take the form `channel-version` to conform to