Skip to content

Commit

Permalink
build(deps-dev): bump linkerd/dev from v43 to v44
Browse files Browse the repository at this point in the history
  • Loading branch information
olix0r committed Dec 6, 2024
1 parent b3d9605 commit 5451f0c
Show file tree
Hide file tree
Showing 59 changed files with 509 additions and 1,472 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkerd2",
"image": "ghcr.io/linkerd/dev:v43",
"image": "ghcr.io/linkerd/dev:v44",
// "dockerFile": "./Dockerfile",
// "context": "..",
"features": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just-dev lint-actions

devcontainer-versions:
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just-dev check-action-images
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-22.04
container:
image: golang:1.22
image: golang:1.23
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: go install gotest.tools/[email protected]
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 15
container:
image: docker://rust:1.76.0
image: docker://rust:1.83.0
options: --security-opt seccomp=unconfined
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
steps:
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:
rust-version:
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- shell: bash
Expand All @@ -39,6 +39,6 @@ jobs:
devcontainer-image:
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just-dev pull-dev-image
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 10
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -40,7 +40,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 10
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -51,7 +51,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 10
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 5
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: helm-docs
- run: git diff --exit-code -- **/charts/**/README.md
12 changes: 6 additions & 6 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ env:
CARGO_NET_RETRY: 10
DOCKER_REGISTRY: ghcr.io/linkerd
GH_ANNOTATION: true
K3D_VERSION: v5.4.4
K3D_VERSION: v5.7.5
RUST_BACKTRACE: short
RUSTUP_MAX_RETRIES: 10
YQ_VERSION: v4.25.1
YQ_VERSION: v4.44.5
LINKERD2_PROXY_REPO: ${{ vars.LINKERD2_PROXY_REPO || 'linkerd/linkerd2-proxy' }}
LINKERD2_PROXY_RELEASE_PREFIX: ${{ vars.LINKERD2_PROXY_RELEASE_PREFIX || 'release/' }}

Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
pattern: image-archives-*
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
pattern: image-archives-*
Expand All @@ -290,7 +290,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
pattern: image-archives-*
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
pattern: image-archives-*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
proto-diff:
timeout-minutes: 10
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- run: apt update && apt install -y unzip
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
env:
GH_ANNOTATION: true
DOCKER_REGISTRY: ghcr.io/linkerd
K3D_VERSION: v5.4.4
K3D_VERSION: v5.7.5
LINKERD2_PROXY_REPO: ${{ vars.LINKERD2_PROXY_REPO }}

jobs:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- name: Download image archives
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
with:
go-version: "1.22"
go-version: "1.23"
- name: Set environment variables from scripts
run: |
TAG='${{ needs.tag.outputs.tag }}'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fmt:
timeout-minutes: 5
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -52,7 +52,7 @@ jobs:
clippy:
timeout-minutes: 20
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -63,7 +63,7 @@ jobs:
check:
timeout-minutes: 20
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -74,7 +74,7 @@ jobs:
name: test
runs-on: ubuntu-22.04
timeout-minutes: 15
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just sh-lint
16 changes: 11 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

run:
deadline: 5m
skip-dirs:
exclude-dirs:
- controller/gen

linters:
enable:
- bodyclose
#TODO - copyloopvar
- errcheck
- errorlint
- exportloopref
- gocritic
- gosec
- gosimple
Expand All @@ -41,9 +41,7 @@ linters:
# - maligned
# - prealloc

disable:
# https://github.com/golangci/golangci-lint/issues/2649
- structcheck
disable: []

linters-settings:
revive:
Expand All @@ -52,6 +50,14 @@ linters-settings:
disabled: true
stylecheck:
checks: ["ST1019"]
errcheck:
exclude-functions:
- fmt.Fprint
- fmt.Fprintf
- fmt.Fprintln
gosec:
excludes:
- G115 # Potential integer overflow when converting between integer types

issues:
exclude-use-default: false
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-proxy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG RUNTIME_IMAGE=gcr.io/distroless/cc-debian12
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
2 changes: 1 addition & 1 deletion bin/k3d
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

K3D_VERSION=v5.4.3
K3D_VERSION=v5.7.5

bindir=$( cd "${0%/*}" && pwd )

Expand Down
8 changes: 7 additions & 1 deletion charts/linkerd-control-plane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ Note that the provided certificates must be ECDSA certificates.

## Adding Linkerd's Helm repository

Included here for completeness-sake, but should have already been added when
`linkerd-base` was installed.

```bash
# To add the repo for Linkerd edge releases:
helm repo add linkerd https://helm.linkerd.io/edge
Expand All @@ -66,6 +69,9 @@ helm install linkerd-control-plane -n linkerd \
linkerd/linkerd-control-plane
```

Note that you require to install this chart in the same namespace you installed
the `linkerd-base` chart.

## Setting High-Availability

Besides the default `values.yaml` file, the chart provides a `values-ha.yaml`
Expand Down Expand Up @@ -313,4 +319,4 @@ Kubernetes: `>=1.22.0-0`
| webhookFailurePolicy | string | `"Ignore"` | Failure policy for the proxy injector |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
2 changes: 1 addition & 1 deletion charts/linkerd-crds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ Kubernetes: `>=1.22.0-0`
| enableTlsRoutes | bool | `true` | |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
2 changes: 1 addition & 1 deletion charts/linkerd2-cni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ Kubernetes: `>=1.22.0-0`
| useWaitFlag | bool | `false` | Configures the CNI plugin to use the -w flag for the iptables command |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
2 changes: 1 addition & 1 deletion charts/partials/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ depended by the 'linkerd' and 'patch' charts.
![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square)

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
2 changes: 1 addition & 1 deletion cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
2 changes: 1 addition & 1 deletion controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
Loading

0 comments on commit 5451f0c

Please sign in to comment.