Skip to content

Commit abcd272

Browse files
authored
Merge pull request #377 from stefanprodan/go-1.23
Build with Go 1.23
2 parents 08238ea + 4af7854 commit abcd272

File tree

9 files changed

+113
-99
lines changed

9 files changed

+113
-99
lines changed

.github/workflows/e2e.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v4
1818
- name: Setup Kubernetes
19-
uses: helm/kind-action@v1.9.0
19+
uses: helm/kind-action@v1.10.0
2020
with:
2121
cluster_name: kind
2222
- name: Build container image
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup Helm
2727
uses: azure/setup-helm@v3
2828
with:
29-
version: v3.14.3
29+
version: v3.16.1
3030
- name: Deploy
3131
run: ./test/deploy.sh
3232
- name: Run integration tests
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Timoni
5353
uses: stefanprodan/timoni/actions/setup@main
5454
- name: Setup Kubernetes
55-
uses: helm/kind-action@v1.9.0
55+
uses: helm/kind-action@v1.10.0
5656
with:
5757
cluster_name: kind
5858
- name: Build container

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
- name: Setup Go
3636
uses: actions/setup-go@v5
3737
with:
38-
go-version: 1.22.x
38+
go-version: 1.23.x
3939
- name: Setup Helm
4040
uses: azure/setup-helm@v3
4141
with:
42-
version: v3.14.3
42+
version: v3.16.1
4343
- name: Setup QEMU
4444
uses: docker/setup-qemu-action@v3
4545
with:

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
contents: read
1111

1212
env:
13-
KUBERNETES_VERSION: 1.26.0
13+
KUBERNETES_VERSION: 1.31.0
1414

1515
jobs:
1616
test:
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Go
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.22.x
24+
go-version: 1.23.x
2525
cache-dependency-path: |
2626
**/go.sum
2727
**/go.mod
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup Helm
3535
uses: azure/setup-helm@v3
3636
with:
37-
version: v3.14.3
37+
version: v3.16.1
3838
- name: Setup CUE
3939
uses: cue-lang/setup-cue@v1.0.0
4040
- name: Setup Timoni

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine as builder
1+
FROM golang:1.23-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.22
1+
FROM golang:1.23
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.22
1+
ARG GO_VERSION=1.23
22
ARG XX_VERSION=1.4.0
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.22
27+
rm -f go.sum; go mod tidy -compat=1.23
2828

2929
vet:
3030
go vet ./...

go.mod

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

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/chzyer/readline v1.5.1
@@ -10,32 +10,32 @@ require (
1010
github.com/gomodule/redigo v1.9.2
1111
github.com/gorilla/mux v1.8.1
1212
github.com/gorilla/websocket v1.5.3
13-
github.com/prometheus/client_golang v1.19.1
13+
github.com/prometheus/client_golang v1.20.4
1414
github.com/spf13/cobra v1.8.1
1515
github.com/spf13/pflag v1.0.5
1616
github.com/spf13/viper v1.19.0
1717
github.com/swaggo/http-swagger v1.3.4
1818
github.com/swaggo/swag v1.16.3
19-
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.52.0
20-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.52.0
21-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0
22-
go.opentelemetry.io/contrib/propagators/aws v1.27.0
23-
go.opentelemetry.io/contrib/propagators/b3 v1.27.0
24-
go.opentelemetry.io/contrib/propagators/jaeger v1.27.0
25-
go.opentelemetry.io/contrib/propagators/ot v1.27.0
26-
go.opentelemetry.io/otel v1.27.0
27-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
28-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
29-
go.opentelemetry.io/otel/sdk v1.27.0
30-
go.opentelemetry.io/otel/trace v1.27.0
19+
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.55.0
20+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.55.0
21+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
22+
go.opentelemetry.io/contrib/propagators/aws v1.30.0
23+
go.opentelemetry.io/contrib/propagators/b3 v1.30.0
24+
go.opentelemetry.io/contrib/propagators/jaeger v1.30.0
25+
go.opentelemetry.io/contrib/propagators/ot v1.30.0
26+
go.opentelemetry.io/otel v1.30.0
27+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0
28+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0
29+
go.opentelemetry.io/otel/sdk v1.30.0
30+
go.opentelemetry.io/otel/trace v1.30.0
3131
go.uber.org/zap v1.27.0
32-
golang.org/x/net v0.26.0
33-
google.golang.org/grpc v1.64.1
34-
google.golang.org/protobuf v1.34.2
32+
golang.org/x/net v0.30.0
33+
google.golang.org/grpc v1.67.1
34+
google.golang.org/protobuf v1.35.0
3535
)
3636

3737
// Fix CVE-2022-32149
38-
replace golang.org/x/text => golang.org/x/text v0.16.0
38+
replace golang.org/x/text => golang.org/x/text v0.19.0
3939

4040
// Fix CVE-2022-28948
4141
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
@@ -44,43 +44,46 @@ require (
4444
github.com/KyleBanks/depth v1.2.1 // indirect
4545
github.com/beorn7/perks v1.0.1 // indirect
4646
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
47-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
47+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4848
github.com/felixge/httpsnoop v1.0.4 // indirect
4949
github.com/go-logr/logr v1.4.2 // indirect
5050
github.com/go-logr/stdr v1.2.2 // indirect
5151
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5252
github.com/go-openapi/jsonreference v0.21.0 // indirect
5353
github.com/go-openapi/spec v0.21.0 // indirect
5454
github.com/go-openapi/swag v0.23.0 // indirect
55-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
55+
github.com/google/uuid v1.6.0 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
5657
github.com/hashicorp/hcl v1.0.0 // indirect
5758
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5859
github.com/josharian/intern v1.0.0 // indirect
60+
github.com/klauspost/compress v1.17.9 // indirect
5961
github.com/magiconair/properties v1.8.7 // indirect
6062
github.com/mailru/easyjson v0.7.7 // indirect
6163
github.com/mattn/go-colorable v0.1.13 // indirect
6264
github.com/mattn/go-isatty v0.0.20 // indirect
6365
github.com/mitchellh/mapstructure v1.5.0 // indirect
66+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6467
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
65-
github.com/prometheus/client_model v0.5.0 // indirect
66-
github.com/prometheus/common v0.48.0 // indirect
67-
github.com/prometheus/procfs v0.12.0 // indirect
68+
github.com/prometheus/client_model v0.6.1 // indirect
69+
github.com/prometheus/common v0.55.0 // indirect
70+
github.com/prometheus/procfs v0.15.1 // indirect
6871
github.com/sagikazarmark/locafero v0.4.0 // indirect
6972
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7073
github.com/sourcegraph/conc v0.3.0 // indirect
7174
github.com/spf13/afero v1.11.0 // indirect
7275
github.com/spf13/cast v1.6.0 // indirect
7376
github.com/subosito/gotenv v1.6.0 // indirect
7477
github.com/swaggo/files v1.0.1 // indirect
75-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
76-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
78+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
79+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7780
go.uber.org/multierr v1.11.0 // indirect
7881
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
79-
golang.org/x/sys v0.21.0 // indirect
80-
golang.org/x/text v0.16.0 // indirect
81-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
82-
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
83-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
82+
golang.org/x/sys v0.26.0 // indirect
83+
golang.org/x/text v0.19.0 // indirect
84+
golang.org/x/tools v0.26.0 // indirect
85+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
86+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
8487
gopkg.in/ini.v1 v1.67.0 // indirect
8588
gopkg.in/yaml.v3 v3.0.1 // indirect
8689
)

0 commit comments

Comments
 (0)