Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Dockerfile.proxy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN --mount=type=secret,id=github \
RUN echo "$LINKERD2_PROXY_VERSION" > proxy-version
ARG LINKERD_AWAIT_VERSION=v0.3.1
RUN bin/scurl -o linkerd-await https://github.com/linkerd/linkerd-await/releases/download/release%2F${LINKERD_AWAIT_VERSION}/linkerd-await-${LINKERD_AWAIT_VERSION}-${TARGETARCH} && chmod +x linkerd-await
ARG LINKERD_VALIDATOR_VERSION=v0.1.5
ARG LINKERD_VALIDATOR_VERSION=v0.1.6
RUN bin/scurl -O https://github.com/linkerd/linkerd2-proxy-init/releases/download/validator%2F${LINKERD_VALIDATOR_VERSION}/linkerd-network-validator-${LINKERD_VALIDATOR_VERSION}-${TARGETARCH}-linux.tgz
RUN tar -zxvf linkerd-network-validator-${LINKERD_VALIDATOR_VERSION}-${TARGETARCH}-linux.tgz && mv linkerd-network-validator-${LINKERD_VALIDATOR_VERSION}-${TARGETARCH}-linux/linkerd-network-validator .

Expand All @@ -45,10 +45,11 @@ 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

## build proxy-init
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v48-go AS proxy-init
FROM --platform=$BUILDPLATFORM golang:1.25.7-alpine AS proxy-init
WORKDIR /build
ARG PROXY_INIT_REPO="linkerd/linkerd2-proxy-init"
ARG PROXY_INIT_REF="proxy-init/v2.4.4"
ARG PROXY_INIT_REF="proxy-init/v2.4.5"
RUN apk add --no-cache ca-certificates git
RUN --mount=type=secret,id=github \
export GITHUB_TOKEN_FILE=/run/secrets/github; \
git init --initial-branch=main . && \
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd2-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ image:
# -- Docker image for the CNI plugin
name: "cr.l5d.io/linkerd/cni-plugin"
# -- Tag for the CNI container Docker image
version: "v1.6.5"
version: "v1.6.6"
# -- Pull policy for the linkerd-cni container
pullPolicy: IfNotPresent

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/testdata/install-cni-plugin_default.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/cmd/testdata/install-cni-plugin_skip_ports.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/cmd/testdata/install_cni_helm_default_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespaceMetadata:
# -- Docker image name for the namespace-metadata instance
name: extension-init
# -- Docker image tag for the namespace-metadata instance
tag: v0.1.7
tag: v0.1.8
# -- Pull policy for the namespace-metadata instance
# @default -- imagePullPolicy
pullPolicy: ""
Expand Down
473 changes: 473 additions & 0 deletions multicluster/static/generated_multicluster_templates.gogen.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/healthcheck/healthcheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2358,7 +2358,7 @@ spec:
serviceAccountName: linkerd-cni
containers:
- name: install-cni
image: cr.l5d.io/linkerd/cni-plugin:v1.6.5
image: cr.l5d.io/linkerd/cni-plugin:v1.6.6
env:
- name: DEST_CNI_NET_DIR
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
// DO NOT EDIT
var Version = undefinedVersion

var LinkerdCNIVersion = "v1.6.5"
var LinkerdCNIVersion = "v1.6.6"

const (
// undefinedVersion should take the form `channel-version` to conform to
Expand Down
2 changes: 1 addition & 1 deletion viz/charts/linkerd-viz/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ namespaceMetadata:
# -- Docker image name for the namespace-metadata instance
name: extension-init
# -- Docker image tag for the namespace-metadata instance
tag: v0.1.7
tag: v0.1.8
# -- Pull policy for the namespace-metadata instance
# @default -- defaultImagePullPolicy
pullPolicy: ""
Expand Down