diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index fcec01f3f55f1..86f93ab68bf29 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -205,7 +205,7 @@ Kubernetes: `>=1.22.0-0` | policyController.image.version | string | linkerdVersion | Tag for the policy controller container image | | policyController.logLevel | string | `"info"` | Log level for the policy controller | | policyController.probeNetworks | list | `["0.0.0.0/0","::/0"]` | The networks from which probes are performed. By default, all networks are allowed so that all probes are authorized. | -| policyController.resources | object | destinationResources | policy controller resource requests & limits | +| policyController.resources | object | `{"cpu":{"limit":"","request":""},"ephemeral-storage":{"limit":"","request":""},"memory":{"limit":"","request":""}}` | policy controller resource requests & limits | | policyController.resources.cpu.limit | string | `""` | Maximum amount of CPU units that the policy controller can use | | policyController.resources.cpu.request | string | `""` | Amount of CPU units that the policy controller requests | | policyController.resources.ephemeral-storage.limit | string | `""` | Maximum amount of ephemeral storage that the policy controller can use | @@ -272,7 +272,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.3.0"` | Tag for the proxy-init container image | +| proxyInit.image.version | string | `"v2.4.0"` | 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 | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index 96efdcd7df9af..37d7768056bca 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -268,7 +268,7 @@ proxyInit: # @default -- imagePullPolicy pullPolicy: "" # -- Tag for the proxy-init container image - version: v2.3.0 + version: v2.4.0 resources: cpu: # -- Maximum amount of CPU units that the proxy-init container can use diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index 2d370893d66fb..42c26a1138be5 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -32,7 +32,7 @@ Kubernetes: `>=1.22.0-0` | ignoreOutboundPorts | string | `""` | Default set of outbound ports to skip via iptables | | image.name | string | `"cr.l5d.io/linkerd/cni-plugin"` | Docker image for the CNI plugin | | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the linkerd-cni container | -| image.version | string | `"v1.4.0"` | Tag for the CNI container Docker image | +| image.version | string | `"v1.5.0"` | Tag for the CNI container Docker image | | imagePullSecrets | list | `[]` | | | inboundProxyPort | int | `4143` | Inbound port for the proxy container | | iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing | diff --git a/charts/linkerd2-cni/values.yaml b/charts/linkerd2-cni/values.yaml index 20770e43d05d2..7e157ba19879e 100644 --- a/charts/linkerd2-cni/values.yaml +++ b/charts/linkerd2-cni/values.yaml @@ -57,7 +57,7 @@ image: # -- Docker image for the CNI plugin name: "cr.l5d.io/linkerd/cni-plugin" # -- Tag for the CNI container Docker image - version: "v1.4.0" + version: "v1.5.0" # -- Pull policy for the linkerd-cni container pullPolicy: IfNotPresent diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index dff610b516c80..98ca3b7913774 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -181,7 +181,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 3cbe715791df1..8a62d7a2b7efe 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -181,7 +181,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -404,7 +404,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 224a9a5d16633..61e95440eba3a 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -181,7 +181,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 e972f351f6838..2653b69f9e159 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -221,7 +221,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 9aa3a8cb6a2d6..f69e3305d13d7 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 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.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -660,7 +660,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -894,7 +894,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 53869b2657606..3b01e055b4ee8 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index 4222a8b826306..ba4d0a812da0f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -195,7 +195,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index 4b6a72d994c56..656da7a4e4e98 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -184,7 +184,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 b63cbcbb0dc2a..7719d4a625108 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -205,7 +205,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 8339889bb4cb0..976105631960a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -209,7 +209,7 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 016d4e12418ae..60ca3c78d951a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 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.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 b6ab28edf73a8..8378871a57dd6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -205,7 +205,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 0475b64ddeecc..945c3c8df7a72 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -192,7 +192,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 420336ebf41d4..17b96f9ca0888 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -193,7 +193,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index a36d3c635a1c0..f9cda17166206 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -48,7 +48,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 344b7c4da94cf..ce722411c13a2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -193,7 +193,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 a39fc2b8810d1..36524631fdfc2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -193,7 +193,7 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 1a91d3508c64a..6f9451bc41082 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -194,7 +194,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 de8fe21b87e61..d99ff3c277eb4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -194,7 +194,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 1ccd4b5b38cbe..a56535a561a4c 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -194,7 +194,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -422,7 +422,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 fa830aaa03e2d..e7eb2b9f5cd04 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -194,7 +194,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -422,7 +422,7 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 85bab7c0b3a85..75e3f51c5d775 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -176,7 +176,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 906a118620a7f..76d3dee78c59d 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -179,7 +179,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 3d80764e3175d..dd3522ac631a3 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -178,7 +178,7 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 257f7bf73e0d1..aafeaf697ff42 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -187,7 +187,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 eed5503b60e42..1fb8dad11cac0 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -193,7 +193,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 d13770bfcde25..cf27426361a96 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -194,7 +194,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -430,7 +430,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 b6c3ced435905..8f8ababa2a70a 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -254,7 +254,7 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install-cni-plugin_default.golden b/cli/cmd/testdata/install-cni-plugin_default.golden index efefc9d9e6fc6..98ea0ce4c08e0 100644 --- a/cli/cmd/testdata/install-cni-plugin_default.golden +++ b/cli/cmd/testdata/install-cni-plugin_default.golden @@ -121,7 +121,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.4.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.0 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden index 4ad64551f01e3..912723dfa6cd7 100644 --- a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden +++ b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden @@ -122,7 +122,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.4.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.0 imagePullPolicy: env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install_cni_helm_default_output.golden b/cli/cmd/testdata/install_cni_helm_default_output.golden index e78e8aaa6aecd..b45084cee427c 100644 --- a/cli/cmd/testdata/install_cni_helm_default_output.golden +++ b/cli/cmd/testdata/install_cni_helm_default_output.golden @@ -114,7 +114,7 @@ spec: # script copies the files into place and then sleeps so # that Kubernetes doesn't keep trying to restart it. - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.4.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.0 imagePullPolicy: IfNotPresent env: - name: DEST_CNI_NET_DIR diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 861a6e5bf43c4..789d5827e1754 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,6 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux + containers: - args: - identity @@ -1086,7 +1087,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,6 +1276,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux + containers: - env: - name: _pod_name @@ -1556,7 +1558,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,6 +1712,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux + containers: - env: - name: _pod_name @@ -1905,7 +1908,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 6b0d3ea3c7c67..c44758061f159 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 dc993ad0e8d49..4e335e1b92918 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -709,7 +709,7 @@ data: image: name: my.custom.registry/linkerd-io/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.3.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.3.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.3.0 + image: my.custom.registry/linkerd-io/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 6b0d3ea3c7c67..c44758061f159 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 498a86968dfae..5e732c4c28ffb 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index aba2f97eb98a1..984b8565d047e 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1084,7 +1084,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1266,7 +1266,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1545,7 +1545,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 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.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 03a16258b52db..0fd32eb268fac 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -736,7 +736,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1168,7 +1168,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1684,7 +1684,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2070,7 +2070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 9eec2d260e5bd..6f26727abbf2b 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -736,7 +736,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1168,7 +1168,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1684,7 +1684,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2070,7 +2070,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 af36952b650cf..5bff44af38e47 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -640,7 +640,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -820,7 +820,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1017,7 +1017,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1206,7 +1206,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1487,7 +1487,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1581,7 +1581,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1777,7 +1777,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 1743cf06c3807..2b2b115e095f3 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1269,7 +1269,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1698,7 +1698,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 7074569dcda38..4a4972bb7d9d2 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 6f3d67fd3c5f6..0146c67db3114 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -709,7 +709,7 @@ data: image: name: cr.l5d.io/linkerd/proxy-init pullPolicy: "" - version: v2.3.0 + version: v2.4.0 iptablesMode: legacy kubeAPIServerPorts: 443,6443 logFormat: "" @@ -889,7 +889,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - args: - identity @@ -1086,7 +1086,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1275,7 +1275,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1556,7 +1556,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.0 imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1710,7 +1710,7 @@ spec: spec: nodeSelector: kubernetes.io/os: linux - + containers: - env: - name: _pod_name @@ -1906,7 +1906,7 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.3.0 + image: cr.l5d.io/linkerd/proxy-init:v2.4.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 163fb9ba82280..6c0593b477035 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:v2.3.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.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 9acbecd577477..31da1df9872d1 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:v2.3.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.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 b79b724def609..c275a23bc54fa 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:v2.3.0", + "image": "cr.l5d.io/linkerd/proxy-init:v2.4.0", "imagePullPolicy": "IfNotPresent", "name": "linkerd-init", "resources": { diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index 35eb4d359220f..42e5f9eeb89aa 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -2396,7 +2396,7 @@ spec: serviceAccountName: linkerd-cni containers: - name: install-cni - image: cr.l5d.io/linkerd/cni-plugin:v1.4.0 + image: cr.l5d.io/linkerd/cni-plugin:v1.5.0 env: - name: DEST_CNI_NET_DIR valueFrom: diff --git a/pkg/version/version.go b/pkg/version/version.go index b1d68d82a8694..0c091fc8dafd0 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -15,8 +15,8 @@ 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.3.0" -var LinkerdCNIVersion = "v1.4.0" +var ProxyInitVersion = "v2.4.0" +var LinkerdCNIVersion = "v1.5.0" const ( // undefinedVersion should take the form `channel-version` to conform to