Skip to content

Commit aa42d34

Browse files
committed
chore(deps): update dependencies in release/v1.4
1 parent f184d7b commit aa42d34

36 files changed

+188
-179
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/go/.devcontainer/base.Dockerfile
22

33
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
4-
ARG VARIANT="1.22"
4+
ARG VARIANT="1.24"
55
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
66

77
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
99
// Append -bullseye or -buster to pin to an OS version.
1010
// Use -bullseye variants on local arm64/Apple Silicon.
11-
"VARIANT": "1.22-bullseye",
11+
"VARIANT": "1.24",
1212
// Options
1313
"NODE_VERSION": "none"
1414
}

.github/workflows/crdgen.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@ on:
99
- ready_for_review
1010
jobs:
1111
crdgen119:
12-
strategy:
13-
matrix:
14-
go-version: ["1.22", "1.23"]
15-
os: [ubuntu-latest]
1612
name: CRDs are Generated
17-
runs-on: ${{ matrix.os }}
13+
runs-on: ubuntu-latest
1814
steps:
1915
- uses: actions/checkout@v4
2016
with:
2117
fetch-depth: 0
2218
- uses: actions/setup-go@v5
2319
with:
24-
go-version: ${{ matrix.go-version }}
20+
go-version-file: go.mod
2521
- name: Regenerate NodeNetworkConfig CRD
2622
run: make -C crd/nodenetworkconfig
2723
- name: Regenerate MultitenantNetworkContainer CRD

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- uses: actions/setup-go@v5
2929
with:
30-
go-version: "^1.22"
30+
go-version-file: go.mod
3131

3232
- name: Setup Kind
3333
uses: engineerd/[email protected]

.github/workflows/cyclonus-netpol-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-go@v5
3636
with:
37-
go-version: '^1.23'
37+
go-version-file: go.mod
3838

3939
- name: Setup Kind
4040
uses: helm/kind-action@v1

.github/workflows/golangci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
name: Lint
2121
runs-on: ${{ matrix.os }}
2222
steps:
23-
- uses: actions/setup-go@v5
24-
with:
25-
go-version: ${{ matrix.go-version }}
2623
- uses: actions/checkout@v4
2724
with:
2825
fetch-depth: 0
26+
- uses: actions/setup-go@v5
27+
with:
28+
go-version-file: go.mod
2929
- name: golangci-lint
3030
uses: golangci/golangci-lint-action@v6
3131
with:
32-
version: v1.61
32+
version: latest
3333
args: --new-from-rev=origin/release/v1.4 --config=.golangci.yml --timeout=25m

.golangci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ linters:
88
- format
99
- performance
1010
- unused
11-
disable:
12-
- maligned
13-
- scopelint
1411
enable:
15-
- exportloopref
12+
- copyloopvar
1613
- goconst
1714
- gocritic
1815
- gocyclo
1916
- gofmt
20-
- gomnd
17+
- mnd
2118
- goprintffuncname
2219
- gosimple
2320
- lll

.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ jobs:
2323
set -e
2424
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
2525
26-
# sig-release provides test suite tarball(s) per k8s release. Just need to provide k8s version "v1.xx.xx"
27-
# pulling k8s version from AKS.
28-
eval k8sVersion="v"$( az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query "currentKubernetesVersion")
29-
echo $k8sVersion
30-
curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
26+
# Final upstream patch for k8s 1.27
27+
curl -L https://dl.k8s.io/v1.27.16/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
3128
3229
# https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list
3330
# explictly unzip and strip directories from ginkgo and e2e.test

azure-ipam/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/azure-container-networking/azure-ipam
22

3-
go 1.23
3+
go 1.24.1
44

55
require (
66
github.com/pkg/errors v0.9.1

azure-ipam/linux.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ ARG DROPGZ_VERSION=v0.0.12
33
ARG OS_VERSION
44
ARG OS
55

6-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23 AS azure-ipam
6+
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.24.1-cbl-mariner2.0 --format "{{.Name}}@{{.Digest}}"
7+
FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:82f110263e6110403fbbef97153f7532780b01afd44d5906753ac31a6b1b9e90 AS azure-ipam
78
ARG OS
89
ARG VERSION
910
WORKDIR /azure-ipam
@@ -18,7 +19,8 @@ COPY --from=azure-ipam /azure-ipam/*.conflist /payload
1819
RUN cd /payload && sha256sum * > sum.txt
1920
RUN gzip --verbose --best --recursive /payload && for f in /payload/*.gz; do mv -- "$f" "${f%%.gz}"; done
2021

21-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23 AS dropgz
22+
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.24.1-cbl-mariner2.0 --format "{{.Name}}@{{.Digest}}"
23+
FROM mcr.microsoft.com/oss/go/microsoft/golang@sha256:82f110263e6110403fbbef97153f7532780b01afd44d5906753ac31a6b1b9e90 AS dropgz
2224
ARG DROPGZ_VERSION
2325
ARG OS
2426
ARG VERSION

0 commit comments

Comments
 (0)