diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 6525221f28a05..695eb5dab3427 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -28,11 +28,15 @@ runs: - uses: crazy-max/ghaction-github-runtime@3cb05d89e1f492524af3d41a1c98c83bc3025124 - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 + with: + driver-opts: network=host - env: DOCKER_REGISTRY: ${{ inputs.docker-registry }} DOCKER_TARGET: ${{ inputs.docker-target }} DOCKER_PUSH: ${{ inputs.docker-push }} TAG: ${{ inputs.tag }} + RUNTIME_IMAGE: localhost:5000/linkerd/proxy-runtime:${{ inputs.tag }} + PUSH_RUNTIME_IMAGE: true shell: bash run: bin/docker-build-${{ inputs.component }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 38c62ce5f07f3..873785dcfbc65 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -80,6 +80,11 @@ jobs: needs: meta if: needs.meta.outputs.changed == 'true' runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }} + services: + registry: + image: registry:3 + ports: + - 5000:5000 strategy: matrix: component: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19bd13218381f..c115bea0fd5a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,11 @@ jobs: contents: read packages: write # for docker/login-action id-token: write # for cosign + services: + registry: + image: registry:3 + ports: + - 5000:5000 strategy: matrix: component: diff --git a/Dockerfile-proxy b/Dockerfile.proxy similarity index 69% rename from Dockerfile-proxy rename to Dockerfile.proxy index e0afeb30c4317..3185642923d25 100644 --- a/Dockerfile-proxy +++ b/Dockerfile.proxy @@ -1,5 +1,6 @@ -ARG RUNTIME_IMAGE=gcr.io/distroless/cc-debian12 ARG BUILDPLATFORM=linux/amd64 +ARG RUNTIME_IMAGE="cr.l5d.io/linkerd/proxy-runtime:latest" +ARG TARGETARCH # Precompile key slow-to-build dependencies FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps @@ -43,8 +44,33 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -mod=readonly ./pkg/... COPY proxy-identity proxy-identity RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/proxy-identity -mod=readonly -ldflags "-s -w" ./proxy-identity -FROM $RUNTIME_IMAGE AS runtime +## build proxy-init +FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v48-go AS proxy-init +WORKDIR /build +ARG PROXY_INIT_REPO="linkerd/linkerd2-proxy-init" +ARG PROXY_INIT_REF="proxy-init/v2.4.3" +RUN --mount=type=secret,id=github \ + export GITHUB_TOKEN_FILE=/run/secrets/github; \ + git init --initial-branch=main . && \ + git remote add origin https://github.com/${PROXY_INIT_REPO}.git && \ + git fetch --depth 1 origin ${PROXY_INIT_REF} && \ + git checkout --detach FETCH_HEAD +RUN go mod download +ARG TARGETARCH +RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \ + go build -o /out/linkerd2-proxy-init -mod=readonly -ldflags "-s -w" -v ./proxy-init + +FROM $RUNTIME_IMAGE-$TARGETARCH AS runtime LABEL org.opencontainers.image.source=https://github.com/linkerd/linkerd2 + +COPY --from=proxy-init /out/linkerd2-proxy-init /usr/lib/linkerd/linkerd2-proxy-init +# Set sys caps for iptables utilities and proxy-init +USER root +RUN ["/usr/sbin/setcap", "cap_net_raw,cap_net_admin+eip", "/usr/sbin/xtables-legacy-multi"] +RUN ["/usr/sbin/setcap", "cap_net_raw,cap_net_admin+eip", "/usr/sbin/xtables-nft-multi"] +RUN ["/usr/sbin/setcap", "cap_net_raw,cap_net_admin+eip", "/usr/lib/linkerd/linkerd2-proxy-init"] +USER 65534 + COPY --from=fetch /build/target/proxy/LICENSE /usr/lib/linkerd/LICENSE COPY --from=fetch /build/proxy-version /usr/lib/linkerd/linkerd2-proxy-version.txt COPY --from=fetch /build/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy diff --git a/bin/docker-build-proxy b/bin/docker-build-proxy index cec2a6f42575e..cccb58cb396d4 100755 --- a/bin/docker-build-proxy +++ b/bin/docker-build-proxy @@ -2,6 +2,8 @@ set -eu +apko_version=v0.30.13 + if [ $# -ne 0 ]; then echo "no arguments allowed for ${0##*/}, given: $*" >&2 exit 64 @@ -14,8 +16,11 @@ rootdir=$( cd "$bindir"/.. && pwd ) . "$bindir"/_docker.sh # shellcheck source=_tag.sh . "$bindir"/_tag.sh +# shellcheck source=_os.sh +. "$bindir"/_os.sh -dockerfile=$rootdir/Dockerfile-proxy +dockerfile=$rootdir/Dockerfile.proxy +runtime_image="${RUNTIME_IMAGE:-"cr.l5d.io/linkerd/proxy-runtime:${TAG:-$(head_root_tag)}"}" get_extra_options() { options= @@ -25,9 +30,22 @@ get_extra_options() { echo "$options" } +# Build proxy base image with apko +go install chainguard.dev/apko@$apko_version +export PATH=$PATH:$(go env GOPATH)/bin +# Add --local flag unless PUSH_RUNTIME_IMAGE is set +apko build "$rootdir/proxy-runtime.yml" "$runtime_image" "$rootdir/proxy-runtime.tar" +docker load < "$rootdir/proxy-runtime.tar" +if [[ -n "${PUSH_RUNTIME_IMAGE:-}" ]]; then + for arch in "arm64" "amd64"; do + docker push "$runtime_image-$arch" + done +fi + # We want wordsplit for the extra options here: # shellcheck disable=SC2046 docker_build proxy "${TAG:-$(head_root_tag)}" "$dockerfile" \ + --build-arg RUNTIME_IMAGE="$runtime_image" \ --build-arg LINKERD_VERSION="${TAG:-$(head_root_tag)}" \ --build-arg LINKERD2_PROXY_REPO="${LINKERD2_PROXY_REPO:-linkerd/linkerd2-proxy}" \ --build-arg LINKERD2_PROXY_VERSION="${LINKERD2_PROXY_VERSION:-$(cat .proxy-version)}" \ diff --git a/charts/partials/templates/_proxy-init.tpl b/charts/partials/templates/_proxy-init.tpl index 5e513dd220ea3..9ba2d183d481e 100644 --- a/charts/partials/templates/_proxy-init.tpl +++ b/charts/partials/templates/_proxy-init.tpl @@ -46,8 +46,9 @@ args: - --subnets-to-ignore - {{ .Values.proxyInit.skipSubnets | quote }} {{- end }} -image: {{.Values.proxyInit.image.name}}:{{.Values.proxyInit.image.version}} -imagePullPolicy: {{.Values.proxyInit.image.pullPolicy | default .Values.imagePullPolicy}} +image: {{.Values.proxy.image.name}}:{{.Values.proxy.image.version | default .Values.linkerdVersion}} +command: ["/usr/lib/linkerd/linkerd2-proxy-init"] +imagePullPolicy: {{.Values.proxy.image.pullPolicy | default .Values.imagePullPolicy}} name: linkerd-init {{ include "partials.resources" .Values.proxy.resources }} securityContext: diff --git a/cli/cmd/doc.go b/cli/cmd/doc.go index f9e914544600c..69c7f8cd3f41e 100644 --- a/cli/cmd/doc.go +++ b/cli/cmd/doc.go @@ -128,14 +128,6 @@ func generateAnnotationsDocs() []annotationDoc { Name: k8s.ProxyImagePullPolicyAnnotation, Description: "Docker image pull policy", }, - { - Name: k8s.ProxyInitImageAnnotation, - Description: "Linkerd init container image name", - }, - { - Name: k8s.ProxyInitImageVersionAnnotation, - Description: "Linkerd init container image version", - }, { Name: k8s.DebugImageAnnotation, Description: "Linkerd debug container image name", diff --git a/cli/cmd/inject.go b/cli/cmd/inject.go index 6cb84c55d64c3..fb3e74c4f6b34 100644 --- a/cli/cmd/inject.go +++ b/cli/cmd/inject.go @@ -417,17 +417,10 @@ func getOverrideAnnotations(values *linkerd2.Values, base *linkerd2.Values) map[ if proxy.Image.Name != baseProxy.Image.Name { overrideAnnotations[k8s.ProxyImageAnnotation] = proxy.Image.Name } - if values.ProxyInit.Image.Name != base.ProxyInit.Image.Name { - overrideAnnotations[k8s.ProxyInitImageAnnotation] = values.ProxyInit.Image.Name - } if values.DebugContainer.Image.Name != base.DebugContainer.Image.Name { overrideAnnotations[k8s.DebugImageAnnotation] = values.DebugContainer.Image.Name } - if values.ProxyInit.Image.Version != base.ProxyInit.Image.Version { - overrideAnnotations[k8s.ProxyInitImageVersionAnnotation] = values.ProxyInit.Image.Version - } - if values.DebugContainer.Image.Version != base.DebugContainer.Image.Version { overrideAnnotations[k8s.DebugImageVersionAnnotation] = values.DebugContainer.Image.Version } diff --git a/cli/cmd/inject_test.go b/cli/cmd/inject_test.go index f31871d8b24c8..a5fcf51f1a67a 100644 --- a/cli/cmd/inject_test.go +++ b/cli/cmd/inject_test.go @@ -782,30 +782,6 @@ func TestProxyImageAnnotations(t *testing.T) { diffOverrides(t, expectedOverrides, overrides) } -func TestProxyInitImageAnnotations(t *testing.T) { - baseValues, err := linkerd2.NewValues() - if err != nil { - t.Fatal(err) - } - values, err := baseValues.DeepCopy() - if err != nil { - t.Fatal(err) - } - values.ProxyInit.Image = &linkerd2.Image{ - Name: "my.registry/linkerd/proxy-init", - Version: "test-proxy-init-version", - } - - expectedOverrides := map[string]string{ - k8s.ProxyInitImageAnnotation: "my.registry/linkerd/proxy-init", - k8s.ProxyInitImageVersionAnnotation: "test-proxy-init-version", - } - - overrides := getOverrideAnnotations(values, baseValues) - - diffOverrides(t, expectedOverrides, overrides) -} - func TestNoAnnotations(t *testing.T) { baseValues, err := linkerd2.NewValues() if err != nil { diff --git a/cli/cmd/install_helm_test.go b/cli/cmd/install_helm_test.go index b963460df7549..821106db68149 100644 --- a/cli/cmd/install_helm_test.go +++ b/cli/cmd/install_helm_test.go @@ -113,11 +113,6 @@ func testRenderHelm(t *testing.T, linkerd2Chart *chart.Chart, additionalValues m "version":"test-proxy-version" } }, - "proxyInit":{ - "image":{ - "version":"test-proxy-init-version" - } - }, "identity":{ "issuer":{ "tls":{ diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go index 3010b6b7e10b0..819bb519e664a 100644 --- a/cli/cmd/install_test.go +++ b/cli/cmd/install_test.go @@ -146,12 +146,7 @@ func TestRender(t *testing.T) { }, }, ProxyInit: &charts.ProxyInit{ - IptablesMode: "legacy", - Image: &charts.Image{ - Name: "ProxyInitImageName", - PullPolicy: "ImagePullPolicy", - Version: "ProxyInitVersion", - }, + IptablesMode: "legacy", IgnoreOutboundPorts: "443", XTMountPath: &charts.VolumeMountPath{ MountPath: "/run", diff --git a/cli/cmd/options.go b/cli/cmd/options.go index 7649a5d896e74..7d09d307b2557 100644 --- a/cli/cmd/options.go +++ b/cli/cmd/options.go @@ -253,23 +253,10 @@ func makeProxyFlags(defaults *l5dcharts.Values) ([]flag.Flag, *pflag.FlagSet) { return nil }), - flag.NewStringFlag(proxyFlags, "init-image", defaults.ProxyInit.Image.Name, "Linkerd init container image name", - func(values *l5dcharts.Values, value string) error { - values.ProxyInit.Image.Name = value - return nil - }), - - flag.NewStringFlag(proxyFlags, "init-image-version", defaults.ProxyInit.Image.Version, - "Linkerd init container image version", func(values *l5dcharts.Values, value string) error { - values.ProxyInit.Image.Version = value - return nil - }), - flag.NewStringFlag(proxyFlags, "image-pull-policy", defaults.ImagePullPolicy, "Docker image pull policy", func(values *l5dcharts.Values, value string) error { values.ImagePullPolicy = value values.Proxy.Image.PullPolicy = value - values.ProxyInit.Image.PullPolicy = value values.DebugContainer.Image.PullPolicy = value return nil }), @@ -409,7 +396,6 @@ func makeProxyFlags(defaults *l5dcharts.Values) ([]flag.Flag, *pflag.FlagSet) { values.ControllerImage = cmd.RegistryOverride(values.ControllerImage, value) values.DebugContainer.Image.Name = cmd.RegistryOverride(values.DebugContainer.Image.Name, value) values.Proxy.Image.Name = cmd.RegistryOverride(values.Proxy.Image.Name, value) - values.ProxyInit.Image.Name = cmd.RegistryOverride(values.ProxyInit.Image.Name, value) return nil }) if reg := os.Getenv(flagspkg.EnvOverrideDockerRegistry); reg != "" { @@ -430,8 +416,6 @@ func makeProxyFlags(defaults *l5dcharts.Values) ([]flag.Flag, *pflag.FlagSet) { proxyFlags.MarkHidden("proxy-image") proxyFlags.MarkHidden("proxy-version") proxyFlags.MarkHidden("image-pull-policy") - proxyFlags.MarkHidden("init-image") - proxyFlags.MarkHidden("init-image-version") } return flags, proxyFlags @@ -573,10 +557,6 @@ func validateProxyValues(values *l5dcharts.Values) error { return fmt.Errorf("%s is not a valid version", values.Proxy.Image.Version) } - if !alphaNumDashDot.MatchString(values.ProxyInit.Image.Version) { - return fmt.Errorf("%s is not a valid version", values.ProxyInit.Image.Version) - } - if values.ImagePullPolicy != "Always" && values.ImagePullPolicy != "IfNotPresent" && values.ImagePullPolicy != "Never" { return fmt.Errorf("--image-pull-policy must be one of: Always, IfNotPresent, Never") } diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 6bceffcb10fce..bd15cf248548b 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -218,7 +218,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:install-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 290ccba07a5bf..b5ddf991bfe15 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -218,7 +218,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:install-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -472,7 +474,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:install-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index 999344afac1be..3ba5da26f744c 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -218,7 +218,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:install-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 4ff12a5c2cc85..157d96561ac70 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -258,7 +258,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index e01f63fd622d6..8c5c4ec7834cd 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -229,7 +229,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -494,7 +496,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -759,7 +763,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -1024,7 +1030,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 21c327d526a5c..e6cc355b8a73f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -229,7 +229,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 6830f136a28d6..80979bfdbe4ba 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -232,7 +232,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 a362a4959f6e9..68a6549b4ccb6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -221,7 +221,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:testinjectversion imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index 706ae5216c18c..3b5b7e5f59b34 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -243,7 +243,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 648fdd2328543..496a67a646248 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -246,7 +246,9 @@ spec: - 4190,9998,7777,8888 - --outbound-ports-to-ignore - "9999" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:override 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 b4dbfd4b6547c..719f25fc2e20e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -229,7 +229,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -494,7 +496,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index d6c89899e5a9d..39d990b487217 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -242,7 +242,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 4569a5d976c5c..d140010ddda6a 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -229,7 +229,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 bab24f11599df..313b911e909bd 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -230,7 +230,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 658b08eef40f1..472437c508fdf 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -53,7 +53,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 a3575f103166f..1b070055eab0e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -230,7 +230,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index 88a233384e85d..9d6acbf766b92 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -230,7 +230,9 @@ spec: - 4190,1234,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index 09402789f2cf2..82be8fd606d2f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -229,7 +229,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index a2c8926de43be..1d9f55aa3582b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -231,7 +231,9 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 10fba99879809..a18078f782286 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -231,7 +231,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 7c9d34b962299..64d24ce09b7fb 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -231,7 +231,9 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -490,7 +492,9 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 7fd6cfc5b80f2..1c2d5999b8dd5 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -231,7 +231,9 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -490,7 +492,9 @@ items: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 8a7301051facb..41928a37b9112 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -213,7 +213,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 08fd0944c3b32..a1310822709e3 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -216,7 +216,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 630af381022e4..123a89d76717b 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -215,7 +215,9 @@ spec: - 4190,4191,22,8100-8102 - --outbound-ports-to-ignore - "5432" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: 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 50b4a484c1852..b79d53c2707f9 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -224,7 +224,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version 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 699e6097ff2cd..776308d30b5df 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -230,7 +230,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index a073c7a7060ef..9e20bccfba161 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -231,7 +231,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:testinjectversion imagePullPolicy: IfNotPresent name: linkerd-init securityContext: @@ -498,7 +500,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:testinjectversion imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index 8976836374694..05e9e0a419977 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -292,7 +292,9 @@ spec: - 4190,4191,4567,4568 - --outbound-ports-to-ignore - 4567,4568 - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + command: + - /usr/lib/linkerd/linkerd2-proxy-init + image: cr.l5d.io/linkerd/proxy:test-inject-proxy-version imagePullPolicy: IfNotPresent name: linkerd-init securityContext: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 4c8efb57f1da7..800e72c3798ac 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1202,7 +1198,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1743,7 +1740,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2173,7 +2171,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 9186c1659ae50..d04d68dc2b3a2 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 6350308fe7d49..5d33e01033340 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: my.custom.registry/linkerd-io/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.3 + image: my.custom.registry/linkerd-io/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.3 + image: my.custom.registry/linkerd-io/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: my.custom.registry/linkerd-io/proxy-init:v2.4.3 + image: my.custom.registry/linkerd-io/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2258,7 +2257,7 @@ spec: --- apiVersion: v1 data: - linkerd-config-overrides: Y29udHJvbGxlckltYWdlOiBteS5jdXN0b20ucmVnaXN0cnkvbGlua2VyZC1pby9jb250cm9sbGVyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgbmFtZTogbXkuY3VzdG9tLnJlZ2lzdHJ5L2xpbmtlcmQtaW8vZGVidWcKICAgIHZlcnNpb246IGluc3RhbGwtZGVidWctdmVyc2lvbgpoZWFydGJlYXRTY2hlZHVsZTogMSAyIDMgNCA1CmlkZW50aXR5OgogIGlzc3VlcjoKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgTUlJQndUQ0NBV2FnQXdJQkFnSVFlRFpwNWxEYUl5Z1E1VWZNS1pyRkFUQUtCZ2dxaGtqT1BRUURBakFwTVNjdwogIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJxYzcwWgogIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgL3dJQkFUQWRCZ05WSFE0RUZnUVU1WXRqVlZQZmQ3STdOTEhzbjJDMjZFQnlHVjB3S1FZRFZSMFJCQ0l3SUlJZQogIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgdmdVQzBkMi85Rk11ZUlWTWIrNDZXVENPanNxcgogIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KbGlua2VyZFZlcnNpb246IGluc3RhbGwtY29udHJvbC1wbGFuZS12ZXJzaW9uCnBvbGljeVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcG9saWN5IHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm94eToKICBpbWFnZToKICAgIG5hbWU6IG15LmN1c3RvbS5yZWdpc3RyeS9saW5rZXJkLWlvL3Byb3h5CiAgICB2ZXJzaW9uOiBpbnN0YWxsLXByb3h5LXZlcnNpb24KcHJveHlJbml0OgogIGltYWdlOgogICAgbmFtZTogbXkuY3VzdG9tLnJlZ2lzdHJ5L2xpbmtlcmQtaW8vcHJveHktaW5pdApwcm94eUluamVjdG9yOgogIGNhQnVuZGxlOiBwcm94eSBpbmplY3RvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQo= + linkerd-config-overrides: Y29udHJvbGxlckltYWdlOiBteS5jdXN0b20ucmVnaXN0cnkvbGlua2VyZC1pby9jb250cm9sbGVyCmRlYnVnQ29udGFpbmVyOgogIGltYWdlOgogICAgbmFtZTogbXkuY3VzdG9tLnJlZ2lzdHJ5L2xpbmtlcmQtaW8vZGVidWcKICAgIHZlcnNpb246IGluc3RhbGwtZGVidWctdmVyc2lvbgpoZWFydGJlYXRTY2hlZHVsZTogMSAyIDMgNCA1CmlkZW50aXR5OgogIGlzc3VlcjoKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgTUlJQndUQ0NBV2FnQXdJQkFnSVFlRFpwNWxEYUl5Z1E1VWZNS1pyRkFUQUtCZ2dxaGtqT1BRUURBakFwTVNjdwogIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJxYzcwWgogIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgL3dJQkFUQWRCZ05WSFE0RUZnUVU1WXRqVlZQZmQ3STdOTEhzbjJDMjZFQnlHVjB3S1FZRFZSMFJCQ0l3SUlJZQogIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgdmdVQzBkMi85Rk11ZUlWTWIrNDZXVENPanNxcgogIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KbGlua2VyZFZlcnNpb246IGluc3RhbGwtY29udHJvbC1wbGFuZS12ZXJzaW9uCnBvbGljeVZhbGlkYXRvcjoKICBjYUJ1bmRsZTogcG9saWN5IHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm94eToKICBpbWFnZToKICAgIG5hbWU6IG15LmN1c3RvbS5yZWdpc3RyeS9saW5rZXJkLWlvL3Byb3h5CiAgICB2ZXJzaW9uOiBpbnN0YWxsLXByb3h5LXZlcnNpb24KcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUK kind: Secret metadata: labels: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 9186c1659ae50..d04d68dc2b3a2 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 6fa3635d0dd0b..d323ff6c7c1f9 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 d8f548d1fe940..501760cb13015 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1198,7 +1194,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1728,7 +1725,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2149,7 +2147,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index c884bf1016d68..9c0a25282c9ad 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1204,7 +1200,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1749,7 +1746,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2184,7 +2182,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 b10c0deb4e21f..346d754c4915d 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -803,10 +803,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1283,7 +1279,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1874,7 +1871,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2346,7 +2344,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 e607ad33536cf..07ea20d987b15 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -803,10 +803,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1283,7 +1279,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1874,7 +1871,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2346,7 +2344,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 610126d70d88d..8969c72d5f64e 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -707,10 +707,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1131,7 +1127,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1670,7 +1667,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2016,7 +2014,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index a6bdd7ff47369..891fbddcbf70d 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -753,10 +753,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "222" ignoreOutboundPorts: "111" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: test-proxy-init-version iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1173,7 +1169,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1714,7 +1711,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2148,7 +2146,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index b46a5f6974af5..4d46545e0661f 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -780,10 +780,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "222" ignoreOutboundPorts: "111" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: test-proxy-init-version iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1256,7 +1252,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1849,7 +1846,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2325,7 +2323,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index 26cd1f9d1227d..316a989154f06 100755 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden @@ -780,10 +780,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "222" ignoreOutboundPorts: "111" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: test-proxy-init-version iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1260,7 +1256,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1859,7 +1856,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2340,7 +2338,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index d22e3b7024c36..ee5e779202ff3 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -784,10 +784,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "444" ignoreOutboundPorts: "333" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: test-proxy-init-version iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1264,7 +1260,8 @@ spec: - "4190,4191,444" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1861,7 +1858,8 @@ spec: - "4190,4191,444" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2345,7 +2343,8 @@ spec: - "4190,4191,444" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index 3d646509b8a64..9127dc2cba92a 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -775,10 +775,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "222" ignoreOutboundPorts: "111" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: test-proxy-init-version iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1246,7 +1242,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1839,7 +1836,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2315,7 +2313,8 @@ spec: - "4190,4191,222" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:test-proxy-init-version + image: cr.l5d.io/linkerd/proxy:test-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 2d04a2a7dc65c..6e899c85d0063 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 1ea0bb90ee4d3..4981ee1dce0ab 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -728,10 +728,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "" ignoreOutboundPorts: "443" - image: - name: ProxyInitImageName - pullPolicy: ImagePullPolicy - version: ProxyInitVersion iptablesMode: legacy kubeAPIServerPorts: "" logFormat: "" @@ -1131,7 +1127,8 @@ spec: - "2102" - --inbound-ports-to-ignore - "4190,4191" - image: ProxyInitImageName:ProxyInitVersion + image: ProxyImageName:ProxyVersion + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: ImagePullPolicy name: linkerd-init resources: @@ -1666,7 +1663,8 @@ spec: - "2102" - --inbound-ports-to-ignore - "4190,4191" - image: ProxyInitImageName:ProxyInitVersion + image: ProxyImageName:ProxyVersion + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: ImagePullPolicy name: linkerd-init resources: @@ -2088,7 +2086,8 @@ spec: - "2102" - --inbound-ports-to-ignore - "4190,4191" - image: ProxyInitImageName:ProxyInitVersion + image: ProxyImageName:ProxyVersion + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: ImagePullPolicy name: linkerd-init resources: @@ -2184,7 +2183,7 @@ spec: --- apiVersion: v1 data: - linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sbGVyR0lEOiAyMTAzCmNvbnRyb2xsZXJJbWFnZTogQ29udHJvbGxlckltYWdlCmNvbnRyb2xsZXJMb2dGb3JtYXQ6IENvbnRyb2xsZXJMb2dGb3JtYXQKY29udHJvbGxlckxvZ0xldmVsOiBDb250cm9sbGVyTG9nTGV2ZWwKZGVidWdDb250YWluZXI6CiAgaW1hZ2U6CiAgICBuYW1lOiBEZWJ1Z0ltYWdlTmFtZQogICAgcHVsbFBvbGljeTogRGVidWdJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IERlYnVnVmVyc2lvbgpkaXNhYmxlSVB2NjogZmFsc2UKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGNvbm5lY3RBZGRyOiAxLjEuMS4xOjIwMDAxCiAgbGlzdGVuQWRkcjogJ1s6Ol06NDE0MCcKICBzZWN1cml0eUNvbnRleHQ6IG51bGwKcG9kTW9uaXRvcjogbnVsbApwb2xpY3lDb250cm9sbGVyOgogIGxvZ0xldmVsOiBsb2ctbGV2ZWwKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdApwb2xpY3lWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHBvbGljeSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJpb3JpdHlDbGFzc05hbWU6IFByaW9yaXR5Q2xhc3NOYW1lCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByb3h5OgogIGNvbnRyb2w6IG51bGwKICBkZWZhdWx0SW5ib3VuZFBvbGljeTogZGVmYXVsdC1hbGxvdy1wb2xpY3kKICBnaWQ6IDIxMDIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5VmVyc2lvbgogIGluYm91bmRDb25uZWN0VGltZW91dDogIiIKICBpbmJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIGxvZ0xldmVsOiB3YXJuLGxpbmtlcmQ9aW5mbwogIG9wYXF1ZVBvcnRzOiAyNSw0NDMsNTg3LDMzMDYsNTQzMiwxMTIxMQogIG91dGJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmRUcmFuc3BvcnRNb2RlOiAiIgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6IGNwdS1saW1pdAogICAgICByZXF1ZXN0OiBjcHUtcmVxdWVzdAogICAgbWVtb3J5OgogICAgICBsaW1pdDogbWVtb3J5LWxpbWl0CiAgICAgIHJlcXVlc3Q6IG1lbW9yeS1yZXF1ZXN0CiAgc2VjdXJpdHlDb250ZXh0OiBudWxsCiAgc3RhcnR1cFByb2JlOiBudWxsCnByb3h5Q29udGFpbmVyTmFtZTogUHJveHlDb250YWluZXJOYW1lCnByb3h5SW5pdDoKICBpZ25vcmVJbmJvdW5kUG9ydHM6ICIiCiAgaWdub3JlT3V0Ym91bmRQb3J0czogIjQ0MyIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW5pdEltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQcm94eUluaXRWZXJzaW9uCiAgaXB0YWJsZXNNb2RlOiBsZWdhY3kKICBrdWJlQVBJU2VydmVyUG9ydHM6ICIiCnByb3h5SW5qZWN0b3I6CiAgY2FCdW5kbGU6IHByb3h5IGluamVjdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnNwVmFsaWRhdG9yOiBudWxsCndlYmhvb2tGYWlsdXJlUG9saWN5OiBXZWJob29rRmFpbHVyZVBvbGljeQo= + linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sbGVyR0lEOiAyMTAzCmNvbnRyb2xsZXJJbWFnZTogQ29udHJvbGxlckltYWdlCmNvbnRyb2xsZXJMb2dGb3JtYXQ6IENvbnRyb2xsZXJMb2dGb3JtYXQKY29udHJvbGxlckxvZ0xldmVsOiBDb250cm9sbGVyTG9nTGV2ZWwKZGVidWdDb250YWluZXI6CiAgaW1hZ2U6CiAgICBuYW1lOiBEZWJ1Z0ltYWdlTmFtZQogICAgcHVsbFBvbGljeTogRGVidWdJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IERlYnVnVmVyc2lvbgpkaXNhYmxlSVB2NjogZmFsc2UKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGNvbm5lY3RBZGRyOiAxLjEuMS4xOjIwMDAxCiAgbGlzdGVuQWRkcjogJ1s6Ol06NDE0MCcKICBzZWN1cml0eUNvbnRleHQ6IG51bGwKcG9kTW9uaXRvcjogbnVsbApwb2xpY3lDb250cm9sbGVyOgogIGxvZ0xldmVsOiBsb2ctbGV2ZWwKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdApwb2xpY3lWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHBvbGljeSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJpb3JpdHlDbGFzc05hbWU6IFByaW9yaXR5Q2xhc3NOYW1lCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByb3h5OgogIGNvbnRyb2w6IG51bGwKICBkZWZhdWx0SW5ib3VuZFBvbGljeTogZGVmYXVsdC1hbGxvdy1wb2xpY3kKICBnaWQ6IDIxMDIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5VmVyc2lvbgogIGluYm91bmRDb25uZWN0VGltZW91dDogIiIKICBpbmJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIGxvZ0xldmVsOiB3YXJuLGxpbmtlcmQ9aW5mbwogIG9wYXF1ZVBvcnRzOiAyNSw0NDMsNTg3LDMzMDYsNTQzMiwxMTIxMQogIG91dGJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmRUcmFuc3BvcnRNb2RlOiAiIgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6IGNwdS1saW1pdAogICAgICByZXF1ZXN0OiBjcHUtcmVxdWVzdAogICAgbWVtb3J5OgogICAgICBsaW1pdDogbWVtb3J5LWxpbWl0CiAgICAgIHJlcXVlc3Q6IG1lbW9yeS1yZXF1ZXN0CiAgc2VjdXJpdHlDb250ZXh0OiBudWxsCiAgc3RhcnR1cFByb2JlOiBudWxsCnByb3h5Q29udGFpbmVyTmFtZTogUHJveHlDb250YWluZXJOYW1lCnByb3h5SW5pdDoKICBpZ25vcmVJbmJvdW5kUG9ydHM6ICIiCiAgaWdub3JlT3V0Ym91bmRQb3J0czogIjQ0MyIKICBpcHRhYmxlc01vZGU6IGxlZ2FjeQogIGt1YmVBUElTZXJ2ZXJQb3J0czogIiIKcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKc3BWYWxpZGF0b3I6IG51bGwKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IFdlYmhvb2tGYWlsdXJlUG9saWN5Cg== kind: Secret metadata: labels: diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 9e95fc3d06363..f3336c01ba090 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 22,8100-8102 ignoreOutboundPorts: "5432" - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,22,8100-8102" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] 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 c9e4fe34b7823..8c94a23c7c402 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -776,10 +776,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: 4567,4568 ignoreOutboundPorts: 4567,4568 - image: - name: cr.l5d.io/linkerd/proxy-init - pullPolicy: "" - version: v2.4.3 iptablesMode: nft kubeAPIServerPorts: 443,6443 logFormat: "" @@ -1200,7 +1196,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -1739,7 +1736,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: @@ -2169,7 +2167,8 @@ spec: - "4190,4191,4567,4568" - --outbound-ports-to-ignore - "443,6443" - image: cr.l5d.io/linkerd/proxy-init:v2.4.3 + image: cr.l5d.io/linkerd/proxy:install-proxy-version + command: ["/usr/lib/linkerd/linkerd2-proxy-init"] imagePullPolicy: IfNotPresent name: linkerd-init resources: diff --git a/controller/proxy-injector/fake/data/pod-cpu-ratio.json b/controller/proxy-injector/fake/data/pod-cpu-ratio.json index 6f80d797ec455..b221c95ab194a 100644 --- a/controller/proxy-injector/fake/data/pod-cpu-ratio.json +++ b/controller/proxy-injector/fake/data/pod-cpu-ratio.json @@ -63,8 +63,11 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": { "requests": { @@ -303,8 +306,8 @@ "value": "30s" }, { - "name": "LINKERD2_PROXY_OUTBOUND_METRICS_HOSTNAME_LABELS", - "value": "false" + "name": "LINKERD2_PROXY_OUTBOUND_METRICS_HOSTNAME_LABELS", + "value": "false" }, { "name": "LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL", diff --git a/controller/proxy-injector/fake/data/pod-log-level.json b/controller/proxy-injector/fake/data/pod-log-level.json index bd6e49e493216..729d4166fb8fa 100644 --- a/controller/proxy-injector/fake/data/pod-log-level.json +++ b/controller/proxy-injector/fake/data/pod-log-level.json @@ -63,8 +63,11 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": null, "securityContext": { @@ -151,12 +154,12 @@ } }, { - "name": "_pod_ip", - "valueFrom": { - "fieldRef": { - "fieldPath": "status.podIP" - } + "name": "_pod_ip", + "valueFrom": { + "fieldRef": { + "fieldPath": "status.podIP" } + } }, { "name": "_pod_nodeName", diff --git a/controller/proxy-injector/fake/data/pod-with-custom-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-custom-debug.patch.json index cafbfd6559199..9bf30f44a5a3c 100644 --- a/controller/proxy-injector/fake/data/pod-with-custom-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-custom-debug.patch.json @@ -63,8 +63,11 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": null, "securityContext": { @@ -175,12 +178,12 @@ } }, { - "name": "_pod_ip", - "valueFrom": { - "fieldRef": { - "fieldPath": "status.podIP" - } + "name": "_pod_ip", + "valueFrom": { + "fieldRef": { + "fieldPath": "status.podIP" } + } }, { "name": "_pod_nodeName", 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 db73decdbcdfe..7e5ebacaa5a1f 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -63,8 +63,11 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": null, "securityContext": { @@ -175,12 +178,12 @@ } }, { - "name": "_pod_ip", - "valueFrom": { - "fieldRef": { - "fieldPath": "status.podIP" - } + "name": "_pod_ip", + "valueFrom": { + "fieldRef": { + "fieldPath": "status.podIP" } + } }, { "name": "_pod_nodeName", 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 b5c962eb12fe9..a106c415702a6 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 @@ -73,8 +73,11 @@ "--outbound-ports-to-ignore", "34567" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": null, "securityContext": { @@ -161,12 +164,12 @@ } }, { - "name": "_pod_ip", - "valueFrom": { - "fieldRef": { - "fieldPath": "status.podIP" - } + "name": "_pod_ip", + "valueFrom": { + "fieldRef": { + "fieldPath": "status.podIP" } + } }, { "name": "_pod_nodeName", diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 726942e53611a..fcc8b2aabc1b2 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -63,8 +63,11 @@ "--outbound-ports-to-ignore", "4567,4568" ], - "image": "cr.l5d.io/linkerd/proxy-init:v2.4.3", + "image": "cr.l5d.io/linkerd/proxy:dev-undefined", "imagePullPolicy": "IfNotPresent", + "command": [ + "/usr/lib/linkerd/linkerd2-proxy-init" + ], "name": "linkerd-init", "resources": null, "securityContext": { @@ -151,12 +154,12 @@ } }, { - "name": "_pod_ip", - "valueFrom": { - "fieldRef": { - "fieldPath": "status.podIP" - } + "name": "_pod_ip", + "valueFrom": { + "fieldRef": { + "fieldPath": "status.podIP" } + } }, { "name": "_pod_nodeName", diff --git a/justfile b/justfile index bc81eea87f79f..50a291f732a5b 100644 --- a/justfile +++ b/justfile @@ -304,7 +304,6 @@ _gateway-url := if GATEWAY_API_VERSION != "linkerd" { "https://github.com/kubern # # We execute these commands lazily in case `yq` isn't present (so that other # just recipes can succeed). -_proxy-init-image-cmd := "yq '.proxyInit.image | \"ghcr.io/linkerd/proxy-init:\" + .version' charts/linkerd-control-plane/values.yaml" _cni-plugin-image-cmd := "yq '.image | \"ghcr.io/linkerd/cni-plugin:\" + .version' charts/linkerd2-cni/values.yaml" _prometheus-image-cmd := "yq '.prometheus.image | .registry + \"/\" + .name + \":\" + .tag' viz/charts/linkerd-viz/values.yaml" @@ -330,7 +329,6 @@ linkerd-install *args='': linkerd-load linkerd-crds-install && _linkerd-ready --set='linkerdVersion={{ linkerd-tag }}' \ --set='proxy.image.name={{ proxy-image }}' \ --set='proxy.image.version={{ linkerd-tag }}' \ - --set='proxyInit.image.name=ghcr.io/linkerd/proxy-init' \ {{ args }} \ | {{ _kubectl }} apply -f - @@ -343,7 +341,7 @@ linkerd-load: _linkerd-images _k3d-init for i in {1..3} ; do {{ _k3d-load }} \ '{{ controller-image }}:{{ linkerd-tag }}' \ '{{ proxy-image }}:{{ linkerd-tag }}' \ - $({{ _proxy-init-image-cmd }}) && exit || sleep 1 ; done + && exit || sleep 1 ; done linkerd-load-cni: docker pull -q $({{ _cni-plugin-image-cmd }}) @@ -355,7 +353,6 @@ linkerd-build: _controller-build _linkerd-images: #!/usr/bin/env bash set -xeuo pipefail - docker pull -q $({{ _proxy-init-image-cmd }}) for img in \ '{{ controller-image }}:{{ linkerd-tag }}' \ '{{ proxy-image }}:{{ linkerd-tag }}' diff --git a/pkg/charts/linkerd2/values.go b/pkg/charts/linkerd2/values.go index cd256b945371a..ecb316e4bbb13 100644 --- a/pkg/charts/linkerd2/values.go +++ b/pkg/charts/linkerd2/values.go @@ -224,7 +224,6 @@ type ( SkipSubnets string `json:"skipSubnets"` LogLevel string `json:"logLevel"` LogFormat string `json:"logFormat"` - Image *Image `json:"image"` SAMountPath *VolumeMountPath `json:"saMountPath"` XTMountPath *VolumeMountPath `json:"xtMountPath"` /* DEPRECATED: should be removed after stable-2.16.0, left in for bc */ diff --git a/pkg/charts/linkerd2/values_test.go b/pkg/charts/linkerd2/values_test.go index 88fd9112a25ed..092fe5850a52e 100644 --- a/pkg/charts/linkerd2/values_test.go +++ b/pkg/charts/linkerd2/values_test.go @@ -16,8 +16,6 @@ func TestNewValues(t *testing.T) { t.Fatalf("Unexpected error: %v\n", err) } - testVersion := "linkerd-dev" - matchExpressionsSimple := []metav1.LabelSelectorRequirement{ { Key: "config.linkerd.io/admission-webhooks", @@ -222,10 +220,6 @@ func TestNewValues(t *testing.T) { KubeAPIServerPorts: "443,6443", LogLevel: "", LogFormat: "", - Image: &Image{ - Name: "cr.l5d.io/linkerd/proxy-init", - Version: testVersion, - }, XTMountPath: &VolumeMountPath{ Name: "linkerd-proxy-init-xtables-lock", MountPath: "/run", @@ -286,11 +280,6 @@ func TestNewValues(t *testing.T) { Egress: &Egress{GlobalEgressNetworkNamespace: "linkerd-egress"}, } - // pin the versions to ensure consistent test result. - // in non-test environment, the default versions are read from the - // values.yaml. - actual.ProxyInit.Image.Version = testVersion - // Make Add-On Values nil to not have to check for their defaults actual.ImagePullSecrets = nil @@ -356,11 +345,6 @@ func TestNewValues(t *testing.T) { }, } - // pin the versions to ensure consistent test result. - // in non-test environment, the default versions are read from the - // values.yaml. - actual.ProxyInit.Image.Version = testVersion - if diff := deep.Equal(expected, actual); diff != nil { t.Errorf("HA Helm values\n%+v", diff) } diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index 3652c40fa4d63..306da1b2a714c 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -1854,11 +1854,6 @@ data: GID: 2102, }, ProxyInit: &linkerd2.ProxyInit{ - Image: &linkerd2.Image{ - Name: "ProxyInitImageName", - PullPolicy: "ImagePullPolicy", - Version: "ProxyInitVersion", - }, XTMountPath: &linkerd2.VolumeMountPath{ MountPath: "/run", Name: "linkerd-proxy-init-xtables-lock", @@ -1879,7 +1874,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","proxyGid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.3.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} + {"proxyImage":{"imageName":"cr.l5d.io/linkerd/proxy","pullPolicy":"IfNotPresent"},"controlPort":{"port":4190},"ignoreInboundPorts":[],"ignoreOutboundPorts":[],"inboundPort":{"port":4143},"adminPort":{"port":4191},"outboundPort":{"port":4140},"resource":{"requestCpu":"","requestMemory":"","limitCpu":"","limitMemory":""},"proxyUid":"2102","proxyGid":"2102","logLevel":{"level":"warn,linkerd=info"},"disableExternalProfiles":true,"proxyVersion":"install-proxy-version","proxy_init_image_version":"v2.3.0","debugImage":{"imageName":"cr.l5d.io/linkerd/debug","pullPolicy":"IfNotPresent"},"debugImageVersion":"install-debug-version"} install: | {"cliVersion":"dev-undefined","flags":[]} values: | @@ -1939,10 +1934,6 @@ data: closeWaitTimeoutSecs: 0 ignoreInboundPorts: "" ignoreOutboundPorts: "" - image: - name: ProxyInitImageName - pullPolicy: ImagePullPolicy - version: ProxyInitVersion resources: saMountPath: null xtMountPath: @@ -1995,11 +1986,6 @@ data: GID: 2102, }, ProxyInit: &linkerd2.ProxyInit{ - Image: &linkerd2.Image{ - Name: "ProxyInitImageName", - PullPolicy: "ImagePullPolicy", - Version: "ProxyInitVersion", - }, XTMountPath: &linkerd2.VolumeMountPath{ MountPath: "/run", Name: "linkerd-proxy-init-xtables-lock", diff --git a/pkg/healthcheck/sidecar_test.go b/pkg/healthcheck/sidecar_test.go index 687c5bd68c005..edcdd6d4f9ed7 100644 --- a/pkg/healthcheck/sidecar_test.go +++ b/pkg/healthcheck/sidecar_test.go @@ -108,7 +108,7 @@ func TestHasExistingSidecars(t *testing.T) { podSpec: &corev1.PodSpec{ InitContainers: []corev1.Container{ { - Image: "cr.l5d.io/linkerd/proxy-init:2.2.0", + Image: "cr.l5d.io/linkerd/proxy:1.0.0", }, }, }, diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index a5a3a97a21afc..6246502427e86 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -47,8 +47,6 @@ var ( k8s.ProxyEnableExternalProfilesAnnotation, k8s.ProxyImagePullPolicyAnnotation, k8s.ProxyInboundPortAnnotation, - k8s.ProxyInitImageAnnotation, - k8s.ProxyInitImageVersionAnnotation, k8s.ProxyOutboundPortAnnotation, k8s.ProxyPodInboundPortsAnnotation, k8s.ProxyCPULimitAnnotation, @@ -225,10 +223,6 @@ func ApplyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s values.Proxy.Image.PullPolicy = override } - if override, ok := annotations[k8s.ProxyInitImageVersionAnnotation]; ok { - values.ProxyInit.Image.Version = override - } - if override, ok := annotations[k8s.ProxyControlPortAnnotation]; ok { controlPort, err := strconv.ParseInt(override, 10, 32) if err == nil { @@ -484,14 +478,6 @@ func ApplyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s } } - if override, ok := annotations[k8s.ProxyInitImageAnnotation]; ok { - values.ProxyInit.Image.Name = override - } - - if override, ok := annotations[k8s.ProxyImagePullPolicyAnnotation]; ok { - values.ProxyInit.Image.PullPolicy = override - } - if override, ok := annotations[k8s.ProxyIgnoreInboundPortsAnnotation]; ok { values.ProxyInit.IgnoreInboundPorts = override } diff --git a/pkg/inject/inject_test.go b/pkg/inject/inject_test.go index 7cc6de8a034c3..46e1f379dd22d 100644 --- a/pkg/inject/inject_test.go +++ b/pkg/inject/inject_test.go @@ -6,7 +6,6 @@ import ( "github.com/go-test/deep" l5dcharts "github.com/linkerd/linkerd2/pkg/charts/linkerd2" "github.com/linkerd/linkerd2/pkg/k8s" - "github.com/linkerd/linkerd2/pkg/version" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" k8sResource "k8s.io/apimachinery/pkg/api/resource" @@ -42,7 +41,6 @@ func TestGetOverriddenValues(t *testing.T) { Annotations: map[string]string{ k8s.ProxyImageAnnotation: "cr.l5d.io/linkerd/proxy", k8s.ProxyImagePullPolicyAnnotation: pullPolicy, - k8s.ProxyInitImageAnnotation: "cr.l5d.io/linkerd/proxy-init", k8s.ProxyControlPortAnnotation: "4000", k8s.ProxyInboundPortAnnotation: "5000", k8s.ProxyAdminPortAnnotation: "5001", @@ -112,9 +110,6 @@ func TestGetOverriddenValues(t *testing.T) { } values.Proxy.UID = 8500 values.Proxy.GID = 8500 - values.ProxyInit.Image.Name = "cr.l5d.io/linkerd/proxy-init" - values.ProxyInit.Image.PullPolicy = pullPolicy - values.ProxyInit.Image.Version = version.ProxyInitVersion values.ProxyInit.IgnoreInboundPorts = "4222,6222" values.ProxyInit.IgnoreOutboundPorts = "8079,8080" values.ProxyInit.SkipSubnets = "172.17.0.0/16" @@ -150,7 +145,6 @@ func TestGetOverriddenValues(t *testing.T) { nsAnnotations: map[string]string{ k8s.ProxyImageAnnotation: "cr.l5d.io/linkerd/proxy", k8s.ProxyImagePullPolicyAnnotation: pullPolicy, - k8s.ProxyInitImageAnnotation: "cr.l5d.io/linkerd/proxy-init", k8s.ProxyControlPortAnnotation: "4000", k8s.ProxyInboundPortAnnotation: "5000", k8s.ProxyAdminPortAnnotation: "5001", @@ -213,9 +207,6 @@ func TestGetOverriddenValues(t *testing.T) { } values.Proxy.UID = 8500 values.Proxy.GID = 8500 - values.ProxyInit.Image.Name = "cr.l5d.io/linkerd/proxy-init" - values.ProxyInit.Image.PullPolicy = pullPolicy - values.ProxyInit.Image.Version = version.ProxyInitVersion values.ProxyInit.IgnoreInboundPorts = "4222,6222" values.ProxyInit.IgnoreOutboundPorts = "8079,8080" values.Proxy.OutboundConnectTimeout = "6000ms" diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go index 3015d4574b0b0..d84ea279011ec 100644 --- a/pkg/k8s/labels.go +++ b/pkg/k8s/labels.go @@ -134,13 +134,6 @@ const ( // proxyImagePullPolicy and proxyInitImagePullPolicy configs. ProxyImagePullPolicyAnnotation = ProxyConfigAnnotationsPrefix + "/image-pull-policy" - // ProxyInitImageAnnotation can be used to override the proxyInitImage - // config. - ProxyInitImageAnnotation = ProxyConfigAnnotationsPrefix + "/init-image" - - // ProxyInitImageVersionAnnotation can be used to override the proxy-init image version - ProxyInitImageVersionAnnotation = ProxyConfigAnnotationsPrefix + "/init-image-version" - // DebugImageAnnotation can be used to override the debugImage config. DebugImageAnnotation = ProxyConfigAnnotationsPrefix + "/debug-image" diff --git a/pkg/version/version.go b/pkg/version/version.go index 8721556e58716..794b02d022cab 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -12,10 +12,6 @@ import ( // DO NOT EDIT 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.4.3" var LinkerdCNIVersion = "v1.6.4" const ( diff --git a/proxy-runtime.yml b/proxy-runtime.yml new file mode 100644 index 0000000000000..7eeb197680fe3 --- /dev/null +++ b/proxy-runtime.yml @@ -0,0 +1,31 @@ +contents: + repositories: + - https://packages.wolfi.dev/os + keyring: + - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub + packages: + - ca-certificates-bundle + - glibc + - iptables + - ip6tables + - libnetfilter_conntrack + - libnfnetlink + - libmnl + - libgcc + - nftables-slim + - libcap-utils +archs: + - x86_64 + - aarch64 +paths: +- path: /run + type: directory + permissions: 0o755 +accounts: + users: + - username: nonroot + uid: 65532 + - username: nobody + uid: 65534 + run-as: 65532 +work-dir: /home/nonroot diff --git a/test/integration/install/inject/inject_test.go b/test/integration/install/inject/inject_test.go index fdbb089e5089b..2444a5e2b8cc0 100644 --- a/test/integration/install/inject/inject_test.go +++ b/test/integration/install/inject/inject_test.go @@ -12,7 +12,6 @@ import ( "github.com/linkerd/linkerd2/controller/gen/client/clientset/versioned/scheme" "github.com/linkerd/linkerd2/pkg/flags" "github.com/linkerd/linkerd2/pkg/k8s" - "github.com/linkerd/linkerd2/pkg/version" "github.com/linkerd/linkerd2/testutil" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -64,7 +63,6 @@ func TestInjectManualParams(t *testing.T) { NoInitContainer: TestHelper.CNI(), Version: "proxy-version", Image: reg + "/proxy-image", - InitImage: reg + "/init-image", ImagePullPolicy: "Never", ControlPort: 123, SkipInboundPorts: "234,345", @@ -126,8 +124,6 @@ func TestInjectAutoParams(t *testing.T) { EnableDebug: true, ImagePullPolicy: "Never", InboundPort: 8882, - InitImage: "init-image", - InitImageVersion: "init-image-version", OutboundPort: 8883, CPULimit: "160m", CPURequest: "150m", @@ -389,13 +385,9 @@ func TestInjectAutoPod(t *testing.T) { initUser := int64(65534) initGroup := int64(65534) seccompProfile := &v1.SeccompProfile{Type: v1.SeccompProfileTypeRuntimeDefault} - reg := "cr.l5d.io/linkerd" - if override := os.Getenv(flags.EnvOverrideDockerRegistry); override != "" { - reg = override - } expectedInitContainer := v1.Container{ - Name: k8s.InitContainerName, - Image: reg + "/proxy-init:" + version.ProxyInitVersion, + Name: k8s.InitContainerName, + Command: []string{"/usr/lib/linkerd/linkerd2-proxy-init"}, Args: []string{ "--firewall-bin-path", "iptables-nft", "--firewall-save-bin-path", "iptables-nft-save", @@ -496,6 +488,8 @@ func TestInjectAutoPod(t *testing.T) { } // Removed token volume name from comparison because it contains a random string initContainer.VolumeMounts[1].Name = "" + // Expect the init container image to use the proxy container image + expectedInitContainer.Image = testutil.GetProxyContainer(pods[0].Spec.Containers).Image if diff := deep.Equal(expectedInitContainer, initContainer); diff != nil { testutil.AnnotatedFatalf(t, "malformed init container", "malformed init container:\n%v", diff) } diff --git a/test/integration/install/install_test.go b/test/integration/install/install_test.go index 2e46d951fa854..2efed2b978828 100644 --- a/test/integration/install/install_test.go +++ b/test/integration/install/install_test.go @@ -360,7 +360,6 @@ func helmUpgradeFlags(root *tls.CA) ([]string, []string) { if override := os.Getenv(flags.EnvOverrideDockerRegistry); override != "" { coreArgs = append(coreArgs, "--set", "proxy.image.name="+cmd.RegistryOverride("cr.l5d.io/linkerd/proxy", override), - "--set", "proxyInit.image.name="+cmd.RegistryOverride("cr.l5d.io/linkerd/proxy-init", override), "--set", "controllerImage="+cmd.RegistryOverride("cr.l5d.io/linkerd/controller", override), "--set", "debugContainer.image.name="+cmd.RegistryOverride("cr.l5d.io/linkerd/debug", override), ) @@ -610,9 +609,6 @@ func TestOverridesSecret(t *testing.T) { "version": TestHelper.GetVersion(), }, } - knownKeys["proxyInit"].(tree.Tree)["image"] = tree.Tree{ - "name": reg + "/proxy-init", - } } // Check for fields that were added during upgrade diff --git a/test/integration/multicluster/install_test.go b/test/integration/multicluster/install_test.go index dd37c9d300ceb..74bf528ce09f3 100644 --- a/test/integration/multicluster/install_test.go +++ b/test/integration/multicluster/install_test.go @@ -16,7 +16,6 @@ import ( mcHealthcheck "github.com/linkerd/linkerd2/multicluster/cmd" "github.com/linkerd/linkerd2/pkg/healthcheck" - "github.com/linkerd/linkerd2/pkg/version" "github.com/linkerd/linkerd2/testutil" ) @@ -118,8 +117,6 @@ func TestInstall(t *testing.T) { cmd = []string{ "install", "--controller-log-level", "debug", - "--set", "proxyInit.image.name=ghcr.io/linkerd/proxy-init", - "--set", fmt.Sprintf("proxyInit.image.version=%s", version.ProxyInitVersion), "--set", fmt.Sprintf("proxy.image.version=%s", TestHelper.GetVersion()), "--set", "heartbeatSchedule=1 2 3 4 5", "--identity-trust-anchors-file", rootPath, diff --git a/test/integration/upgrade-edge/upgrade_edge_test.go b/test/integration/upgrade-edge/upgrade_edge_test.go index 40a1ff92f7742..28f1376f903e9 100644 --- a/test/integration/upgrade-edge/upgrade_edge_test.go +++ b/test/integration/upgrade-edge/upgrade_edge_test.go @@ -380,10 +380,6 @@ func TestOverridesSecret(t *testing.T) { "name": reg + "/proxy", }, } - knownKeys["proxyInit"].(tree.Tree)["image"] = tree.Tree{ - "name": reg + "/proxy-init", - } - } // Check if the keys in overridesTree match with knownKeys diff --git a/testutil/inject_validator.go b/testutil/inject_validator.go index 2dfe6c07bd005..9f6fff186630a 100644 --- a/testutil/inject_validator.go +++ b/testutil/inject_validator.go @@ -25,8 +25,6 @@ type InjectValidator struct { EnableExternalProfiles bool ImagePullPolicy string InboundPort int - InitImage string - InitImageVersion string OutboundPort int CPULimit string EphemeralStorageLimit string @@ -333,27 +331,6 @@ func (iv *InjectValidator) validateInitContainer(pod *v1.PodSpec) error { return fmt.Errorf("container %s missing", k8s.InitContainerName) } - if iv.InitImage != "" || iv.InitImageVersion != "" { - - image := strings.Split(initContainer.Image, ":") - - if len(image) != 2 { - return fmt.Errorf("invalid proxy init image string: %s", initContainer.Image) - } - - if iv.InitImage != "" { - if image[0] != iv.InitImage { - return fmt.Errorf("proxyInitImage: expected %s, actual %s", iv.InitImage, image[0]) - } - } - - if iv.InitImageVersion != "" { - if image[1] != iv.InitImageVersion { - return fmt.Errorf("proxyInitImageVersion: expected %s, actual %s", iv.InitImageVersion, image[1]) - } - } - } - if iv.InboundPort != 0 { if err := iv.validateArg(initContainer, "--incoming-proxy-port", strconv.Itoa(iv.InboundPort)); err != nil { return err @@ -470,16 +447,6 @@ func (iv *InjectValidator) GetFlagsAndAnnotations() ([]string, map[string]string flags = append(flags, fmt.Sprintf("--inbound-port=%s", strconv.Itoa(iv.InboundPort))) } - if iv.InitImage != "" { - annotations[k8s.ProxyInitImageAnnotation] = iv.InitImage - flags = append(flags, fmt.Sprintf("--init-image=%s", iv.InitImage)) - } - - if iv.InitImageVersion != "" { - annotations[k8s.ProxyInitImageVersionAnnotation] = iv.InitImageVersion - flags = append(flags, fmt.Sprintf("--init-image-version=%s", iv.InitImageVersion)) - } - if iv.OutboundPort != 0 { annotations[k8s.ProxyOutboundPortAnnotation] = strconv.Itoa(iv.OutboundPort) flags = append(flags, fmt.Sprintf("--outbound-port=%s", strconv.Itoa(iv.OutboundPort)))