Skip to content

Commit 1ff6fff

Browse files
authored
Merge pull request #416 from stefanprodan/go-1.25
Build with Go 1.25
2 parents 65b9e92 + 98e8cd3 commit 1ff6fff

File tree

8 files changed

+116
-113
lines changed

8 files changed

+116
-113
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Go
3636
uses: actions/setup-go@v6
3737
with:
38-
go-version: 1.24.x
38+
go-version: 1.25.x
3939
- name: Setup Helm
4040
uses: azure/setup-helm@v4
4141
with:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Go
2323
uses: actions/setup-go@v6
2424
with:
25-
go-version: 1.24.x
25+
go-version: 1.25.x
2626
cache-dependency-path: |
2727
**/go.sum
2828
**/go.mod

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-alpine AS builder
1+
FROM golang:1.25-alpine AS builder
22

33
ARG REVISION
44

Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24
1+
FROM golang:1.25
22

33
WORKDIR /workspace
44

Dockerfile.xx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.24
1+
ARG GO_VERSION=1.25
22
ARG XX_VERSION=1.6.1
33

44
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ build:
2424
GIT_COMMIT=$$(git rev-list -1 HEAD) && CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/stefanprodan/podinfo/pkg/version.REVISION=$(GIT_COMMIT)" -a -o ./bin/podcli ./cmd/podcli/*
2525

2626
tidy:
27-
rm -f go.sum; go mod tidy -compat=1.24
27+
rm -f go.sum; go mod tidy -compat=1.25
2828

2929
vet:
3030
go vet ./...

go.mod

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/stefanprodan/podinfo
22

3-
go 1.24
3+
go 1.25
44

55
require (
66
github.com/chzyer/readline v1.5.1
@@ -11,36 +11,33 @@ require (
1111
github.com/gorilla/mux v1.8.1
1212
github.com/gorilla/websocket v1.5.3
1313
github.com/prometheus/client_golang v1.22.0
14-
github.com/spf13/cobra v1.9.1
15-
github.com/spf13/pflag v1.0.6
16-
github.com/spf13/viper v1.20.1
14+
github.com/spf13/cobra v1.10.1
15+
github.com/spf13/pflag v1.0.10
16+
github.com/spf13/viper v1.21.0
1717
github.com/swaggo/http-swagger v1.3.4
1818
github.com/swaggo/swag v1.16.4
19-
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.62.0
20-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0
21-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
22-
go.opentelemetry.io/contrib/propagators/aws v1.37.0
23-
go.opentelemetry.io/contrib/propagators/b3 v1.37.0
24-
go.opentelemetry.io/contrib/propagators/jaeger v1.37.0
25-
go.opentelemetry.io/contrib/propagators/ot v1.37.0
26-
go.opentelemetry.io/otel v1.37.0
27-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0
28-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
29-
go.opentelemetry.io/otel/sdk v1.37.0
30-
go.opentelemetry.io/otel/trace v1.37.0
19+
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.63.0
20+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0
21+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
22+
go.opentelemetry.io/contrib/propagators/aws v1.38.0
23+
go.opentelemetry.io/contrib/propagators/b3 v1.38.0
24+
go.opentelemetry.io/contrib/propagators/jaeger v1.38.0
25+
go.opentelemetry.io/contrib/propagators/ot v1.38.0
26+
go.opentelemetry.io/otel v1.38.0
27+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
28+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
29+
go.opentelemetry.io/otel/sdk v1.38.0
30+
go.opentelemetry.io/otel/trace v1.38.0
3131
go.uber.org/zap v1.27.0
32-
golang.org/x/net v0.42.0
33-
google.golang.org/grpc v1.73.0
34-
google.golang.org/protobuf v1.36.6
32+
golang.org/x/net v0.44.0
33+
google.golang.org/grpc v1.75.1
34+
google.golang.org/protobuf v1.36.9
3535
)
3636

37-
// Fix CVE-2022-28948
38-
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
39-
4037
require (
4138
github.com/KyleBanks/depth v1.2.1 // indirect
4239
github.com/beorn7/perks v1.0.1 // indirect
43-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
40+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4441
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4542
github.com/felixge/httpsnoop v1.0.4 // indirect
4643
github.com/go-logr/logr v1.4.3 // indirect
@@ -51,7 +48,7 @@ require (
5148
github.com/go-openapi/swag v0.23.1 // indirect
5249
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5350
github.com/google/uuid v1.6.0 // indirect
54-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
51+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
5552
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5653
github.com/josharian/intern v1.0.0 // indirect
5754
github.com/mailru/easyjson v0.9.0 // indirect
@@ -62,20 +59,21 @@ require (
6259
github.com/prometheus/client_model v0.6.1 // indirect
6360
github.com/prometheus/common v0.62.0 // indirect
6461
github.com/prometheus/procfs v0.15.1 // indirect
65-
github.com/sagikazarmark/locafero v0.9.0 // indirect
66-
github.com/sourcegraph/conc v0.3.0 // indirect
67-
github.com/spf13/afero v1.14.0 // indirect
68-
github.com/spf13/cast v1.9.2 // indirect
62+
github.com/sagikazarmark/locafero v0.11.0 // indirect
63+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
64+
github.com/spf13/afero v1.15.0 // indirect
65+
github.com/spf13/cast v1.10.0 // indirect
6966
github.com/subosito/gotenv v1.6.0 // indirect
7067
github.com/swaggo/files v1.0.1 // indirect
7168
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
72-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
73-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
69+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
70+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
7471
go.uber.org/multierr v1.11.0 // indirect
75-
golang.org/x/sys v0.34.0 // indirect
76-
golang.org/x/text v0.27.0 // indirect
77-
golang.org/x/tools v0.35.0 // indirect
78-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
79-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
72+
go.yaml.in/yaml/v3 v3.0.4 // indirect
73+
golang.org/x/sys v0.36.0 // indirect
74+
golang.org/x/text v0.29.0 // indirect
75+
golang.org/x/tools v0.36.0 // indirect
76+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
77+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
8078
gopkg.in/yaml.v3 v3.0.1 // indirect
8179
)

0 commit comments

Comments
 (0)