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
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",
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.go",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just action-dev-check
6 changes: 3 additions & 3 deletions .github/workflows/cni-plugin-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run CNI integration tests
env:
Expand All @@ -31,15 +31,15 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run CNI ordering tests
run: just cni-plugin-test-ordering
repair-controller:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run repair-controller tests
run: just cni-repair-controller-integration
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ permissions:
jobs:
lint:
runs-on: ubuntu-latest
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
- run: just go-lint --verbose --timeout=10m

fmt:
runs-on: ubuntu-latest
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
- run: just go-fmt-check

unit-test:
runs-on: ubuntu-latest
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/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run proxy-init integration tests
run: just proxy-init-test-integration
2 changes: 1 addition & 1 deletion .github/workflows/release-cni-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
restore-keys: cni-plugin-${{ needs.meta.outputs.mode }}-

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: |
just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-proxy-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
restore-keys: proxy-init-${{ needs.meta.outputs.mode }}-

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: |
just proxy-init-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
meta:
timeout-minutes: 15
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: ./.github/actions/version-mode
Expand All @@ -34,7 +34,7 @@ jobs:
arch: [amd64, arm64, arm]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust-musl
container: ghcr.io/linkerd/dev:v44-rust-musl
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just validator arch=${{ matrix.arch }} profile=release version=${{ needs.meta.outputs.version }} package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
check:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just rs-fetch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@v44
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just sh-lint
3 changes: 1 addition & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
linters:
enable:
# TODO - copyloopvar.
- errcheck
- errorlint
- exportloopref
- goconst
- gocritic
- gosec
Expand Down Expand Up @@ -31,7 +31,6 @@ linters:
# Disabled for generics https://github.com/golangci/golangci-lint/issues/2649
disable:
- bodyclose
- structcheck
- unparam


Expand Down
2 changes: 1 addition & 1 deletion cni-plugin/integration/Dockerfile-tester
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# 1) a specific k3d cluster configured with CNI
# 2) a test suite (e.g. `flannel.go`) runs with a configured CNI plugin.

FROM golang:1.22-alpine as build
FROM golang:1.23-alpine as build
RUN apk add build-base
ENV GOCACHE=/tmp/
WORKDIR /src
Expand Down
15 changes: 6 additions & 9 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[graph]
targets = [
{ triple = "x86_64-unknown-linux-gnu" },
{ triple = "aarch64-unknown-linux-gnu" },
Expand All @@ -7,8 +8,11 @@ targets = [
[advisories]
db-path = "~/.cargo/advisory-db"
db-urls = ["https://github.com/rustsec/advisory-db"]
yanked = "deny"
ignore = []
ignore = [
# Update kube to address unmaintained dependencies
"RUSTSEC-2024-0384",
"RUSTSEC-2024-0388",
]

[licenses]
allow = ["Apache-2.0", "BSD-3-Clause", "ISC", "MIT"]
Expand Down Expand Up @@ -46,19 +50,12 @@ multiple-versions = "deny"
# Wildcard dependencies are used for all workspace-local crates.
wildcards = "allow"
highlight = "all"
deny = []
skip = [
# `rustls-pemfile` and `k8s-openapi` depend on versions of `base64` that
# have diverged significantly.
{ name = "base64" },
# https://github.com/hawkw/matchers/pull/4
{ name = "regex-automata", version = "0.1" },
{ name = "regex-syntax", version = "0.6" },
# syn v2 has been released and some libraries are slower to adopt it
{ name = "syn", version = "1.0" },
# recent tokio versions (v1.34) depend on socket2 v0.5.5 while hyper is
# stuck on v0.4.10
{ name = "socket2" },
]
skip-tree = [
# `serde_json` and `h2` depend on diverged versions of `indexmap` (2.0.x and
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/linkerd/linkerd2-proxy-init

go 1.22.0
go 1.23.0

toolchain go1.22.3
toolchain go1.23.3

require (
github.com/containernetworking/cni v1.2.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (

func returnHostAndPortHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("Got request [%v] returning [%s]\n", r, response())
fmt.Fprintln(w, response())
_, _ = fmt.Fprintln(w, response())
}

func callOtherServiceHandler(w http.ResponseWriter, r *http.Request) {
Expand All @@ -35,7 +35,7 @@ func callOtherServiceHandler(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), 500)
} else {
response := fmt.Sprintf("me:[%s]downstream:[%s]", response(), strings.TrimSpace(string(body)))
fmt.Fprintln(w, response)
_, _ = fmt.Fprintln(w, response)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.76.0"
channel = "1.83.0"
Loading