Skip to content

Commit b9407a5

Browse files
authored
Merge pull request #246 from projectsyn/deps/bulk-update-go
Update Go to 1.26 and bulk update Go dependencies
2 parents 7254d6b + 677e975 commit b9407a5

8 files changed

Lines changed: 400 additions & 359 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax = docker/dockerfile:experimental
22

3-
FROM docker.io/golang:1.22 as build
3+
FROM docker.io/golang:1.26 AS build
44
ARG VERSION
55

66
WORKDIR /app

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ run: generate
7474

7575
.PHONY: watch
7676
watch: generate
77-
go run github.com/cosmtrek/air
77+
go tool github.com/air-verse/air
7878

7979
.PHONY: clean
8080
clean:

go.mod

Lines changed: 70 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,106 @@
11
module github.com/projectsyn/lieutenant-api
22

3-
go 1.22.0
4-
5-
toolchain go1.22.3
3+
go 1.26.1
64

75
require (
86
github.com/AlekSi/pointer v1.2.0
9-
github.com/cosmtrek/air v1.52.0
10-
github.com/deepmap/oapi-codegen/v2 v2.1.0
11-
github.com/getkin/kin-openapi v0.123.0
12-
github.com/go-logr/logr v1.4.2
7+
github.com/getkin/kin-openapi v0.133.0
8+
github.com/go-logr/logr v1.4.3
139
github.com/hashicorp/golang-lru v1.0.2
14-
github.com/labstack/echo/v4 v4.12.0
15-
github.com/oapi-codegen/echo-middleware v1.0.1
16-
github.com/oapi-codegen/runtime v1.1.1
10+
github.com/labstack/echo/v4 v4.15.1
11+
github.com/oapi-codegen/echo-middleware v1.0.2
12+
github.com/oapi-codegen/runtime v1.4.0
1713
github.com/oapi-codegen/testutil v1.1.0
18-
github.com/projectsyn/lieutenant-operator v1.11.6
19-
github.com/stretchr/testify v1.9.0
14+
github.com/projectsyn/lieutenant-operator v1.11.12
15+
github.com/stretchr/testify v1.11.1
2016
github.com/taion809/haikunator v0.0.0-20150324135039-4e414e676fd1
2117
go.uber.org/multierr v1.11.0
22-
k8s.io/api v0.30.1
23-
k8s.io/apimachinery v0.30.1
24-
sigs.k8s.io/controller-runtime v0.18.3
18+
k8s.io/api v0.33.3
19+
k8s.io/apimachinery v0.33.3
20+
sigs.k8s.io/controller-runtime v0.21.0
2521
)
2622

2723
require (
28-
dario.cat/mergo v1.0.0 // indirect
24+
dario.cat/mergo v1.0.2 // indirect
25+
github.com/air-verse/air v1.65.1 // indirect
26+
github.com/andybalholm/brotli v1.2.0 // indirect
2927
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
30-
github.com/bep/godartsass v1.2.0 // indirect
31-
github.com/bep/godartsass/v2 v2.0.0 // indirect
32-
github.com/bep/golibsass v1.1.1 // indirect
33-
github.com/cli/safeexec v1.0.1 // indirect
34-
github.com/creack/pty v1.1.21 // indirect
28+
github.com/bep/godartsass/v2 v2.5.0 // indirect
29+
github.com/bep/golibsass v1.2.0 // indirect
3530
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
36-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
37-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
39-
github.com/fatih/color v1.17.0 // indirect
40-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
31+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
32+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
34+
github.com/fatih/color v1.18.0 // indirect
35+
github.com/fsnotify/fsnotify v1.9.0 // indirect
36+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
37+
github.com/go-openapi/jsonpointer v0.21.2 // indirect
4238
github.com/go-openapi/jsonreference v0.21.0 // indirect
43-
github.com/go-openapi/swag v0.23.0 // indirect
39+
github.com/go-openapi/swag v0.23.1 // indirect
4440
github.com/gobwas/glob v0.2.3 // indirect
4541
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/gohugoio/hugo v0.126.1 // indirect
47-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
48-
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/gnostic-models v0.6.8 // indirect
50-
github.com/google/gofuzz v1.2.0 // indirect
42+
github.com/gohugoio/hugo v0.149.1 // indirect
43+
github.com/google/gnostic-models v0.7.0 // indirect
44+
github.com/google/go-cmp v0.7.0 // indirect
5145
github.com/google/uuid v1.6.0 // indirect
5246
github.com/gorilla/mux v1.8.1 // indirect
53-
github.com/imdario/mergo v0.3.16 // indirect
54-
github.com/invopop/yaml v0.3.1 // indirect
47+
github.com/joho/godotenv v1.5.1 // indirect
5548
github.com/josharian/intern v1.0.0 // indirect
5649
github.com/json-iterator/go v1.1.12 // indirect
5750
github.com/labstack/gommon v0.4.2 // indirect
58-
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/mattn/go-colorable v0.1.13 // indirect
51+
github.com/mailru/easyjson v0.9.0 // indirect
52+
github.com/mattn/go-colorable v0.1.14 // indirect
6053
github.com/mattn/go-isatty v0.0.20 // indirect
61-
github.com/mattn/go-runewidth v0.0.15 // indirect
62-
github.com/mitchellh/hashstructure v1.1.0 // indirect
6354
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6455
github.com/modern-go/reflect2 v1.0.2 // indirect
6556
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6657
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
58+
github.com/oapi-codegen/oapi-codegen/v2 v2.6.0 // indirect
59+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
60+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
6761
github.com/pelletier/go-toml v1.9.5 // indirect
68-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
62+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
6963
github.com/perimeterx/marshmallow v1.1.5 // indirect
70-
github.com/pkg/errors v0.9.1 // indirect
7164
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
72-
github.com/spf13/afero v1.11.0 // indirect
73-
github.com/spf13/cast v1.6.0 // indirect
74-
github.com/spf13/pflag v1.0.5 // indirect
75-
github.com/tdewolff/minify/v2 v2.20.31 // indirect
76-
github.com/tdewolff/parse/v2 v2.7.14 // indirect
77-
github.com/ugorji/go/codec v1.2.12 // indirect
65+
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
66+
github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
67+
github.com/spf13/afero v1.14.0 // indirect
68+
github.com/spf13/cast v1.9.2 // indirect
69+
github.com/spf13/pflag v1.0.7 // indirect
70+
github.com/tdewolff/parse/v2 v2.8.3 // indirect
7871
github.com/valyala/bytebufferpool v1.0.0 // indirect
7972
github.com/valyala/fasttemplate v1.2.2 // indirect
80-
golang.org/x/crypto v0.25.0 // indirect
81-
golang.org/x/mod v0.19.0 // indirect
82-
golang.org/x/net v0.27.0 // indirect
83-
golang.org/x/oauth2 v0.20.0 // indirect
84-
golang.org/x/sync v0.7.0 // indirect
85-
golang.org/x/sys v0.22.0 // indirect
86-
golang.org/x/term v0.22.0 // indirect
87-
golang.org/x/text v0.16.0 // indirect
88-
golang.org/x/time v0.5.0 // indirect
89-
golang.org/x/tools v0.23.0 // indirect
90-
google.golang.org/protobuf v1.34.1 // indirect
73+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
74+
github.com/woodsbury/decimal128 v1.3.0 // indirect
75+
github.com/x448/float16 v0.8.4 // indirect
76+
go.yaml.in/yaml/v2 v2.4.2 // indirect
77+
go.yaml.in/yaml/v3 v3.0.4 // indirect
78+
golang.org/x/crypto v0.49.0 // indirect
79+
golang.org/x/mod v0.33.0 // indirect
80+
golang.org/x/net v0.52.0 // indirect
81+
golang.org/x/oauth2 v0.34.0 // indirect
82+
golang.org/x/sync v0.20.0 // indirect
83+
golang.org/x/sys v0.42.0 // indirect
84+
golang.org/x/term v0.41.0 // indirect
85+
golang.org/x/text v0.35.0 // indirect
86+
golang.org/x/time v0.14.0 // indirect
87+
golang.org/x/tools v0.42.0 // indirect
88+
google.golang.org/protobuf v1.36.11 // indirect
89+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
9190
gopkg.in/inf.v0 v0.9.1 // indirect
9291
gopkg.in/yaml.v2 v2.4.0 // indirect
9392
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/client-go v0.30.1 // indirect
95-
k8s.io/klog/v2 v2.120.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
97-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
98-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
100-
sigs.k8s.io/yaml v1.4.0 // indirect
93+
k8s.io/client-go v0.33.3 // indirect
94+
k8s.io/klog/v2 v2.130.1 // indirect
95+
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
96+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
97+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
98+
sigs.k8s.io/randfill v1.0.0 // indirect
99+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
100+
sigs.k8s.io/yaml v1.6.0 // indirect
101+
)
102+
103+
tool (
104+
github.com/air-verse/air
105+
github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
101106
)

0 commit comments

Comments
 (0)