Skip to content

Commit 2acdf0a

Browse files
authored
fix: upgrade go and dependencies (#176)
1 parent 45d3c45 commit 2acdf0a

File tree

8 files changed

+163
-179
lines changed

8 files changed

+163
-179
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2222
with:
23-
go-version: 1.22.x
23+
go-version: 1.24.x
2424
- name: Tests
2525
run: make test
2626
- name: Send go coverage report

.github/workflows/pr-build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup Go
5757
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5858
with:
59-
go-version: 1.22.x
59+
go-version: 1.24.x
6060
- name: fmt
6161
run: make fmt
6262
- name: vet
@@ -90,7 +90,7 @@ jobs:
9090
- name: Setup Go
9191
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
9292
with:
93-
go-version: 1.22.x
93+
go-version: 1.24.x
9494
- name: run test
9595
run: make test ENVTEST_K8S_VERSION=${{ matrix.kubernetes-version }}
9696

@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup Go
109109
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
110110
with:
111-
go-version: 1.22.x
111+
go-version: 1.24.x
112112
- name: build
113113
run: make build
114114
- name: Check if working tree is dirty

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2626
with:
27-
go-version: '1.22'
27+
go-version: '1.24.x'
2828
- name: Docker Login
2929
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
3030
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ controller-gen: ## Download controller-gen locally if necessary.
139139
GOLANGCI_LINT = $(GOBIN)/golangci-lint
140140
.PHONY: golangci-lint
141141
golangci-lint: ## Download golint locally if necessary
142-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2)
142+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.2)
143143

144144
KUSTOMIZE = $(GOBIN)/kustomize
145145
.PHONY: kustomize

go.mod

Lines changed: 48 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/DoodleScheduling/oauth2-redirect-controller
22

3-
go 1.22.0
3+
go 1.24.2
44

55
require (
6-
github.com/fluxcd/pkg/runtime v0.49.1
6+
github.com/fluxcd/pkg/runtime v0.58.0
77
github.com/go-logr/logr v1.4.2
8-
github.com/onsi/gomega v1.36.2
8+
github.com/onsi/gomega v1.37.0
99
github.com/spf13/pflag v1.0.6
1010
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
1111
go.opentelemetry.io/contrib/propagators/b3 v1.35.0
@@ -14,106 +14,101 @@ require (
1414
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
1515
go.opentelemetry.io/otel/sdk v1.35.0
1616
google.golang.org/grpc v1.71.1
17-
k8s.io/api v0.31.3
18-
k8s.io/apimachinery v0.31.4
19-
k8s.io/client-go v0.31.3
20-
sigs.k8s.io/controller-runtime v0.19.4
17+
k8s.io/api v0.32.3
18+
k8s.io/apimachinery v0.32.3
19+
k8s.io/client-go v0.32.3
20+
sigs.k8s.io/controller-runtime v0.20.4
2121
)
2222

2323
require (
24-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
24+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2525
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2626
github.com/beorn7/perks v1.0.1 // indirect
2727
github.com/blang/semver/v4 v4.0.0 // indirect
2828
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2929
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3030
github.com/chai2010/gettext-go v1.0.3 // indirect
3131
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
32+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3434
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
36-
github.com/fluxcd/cli-utils v0.36.0-flux.9 // indirect
37-
github.com/fluxcd/pkg/apis/meta v1.6.1 // indirect
38-
github.com/fsnotify/fsnotify v1.7.0 // indirect
39-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
36+
github.com/fluxcd/cli-utils v0.36.0-flux.12 // indirect
37+
github.com/fluxcd/pkg/apis/meta v1.10.0 // indirect
38+
github.com/fsnotify/fsnotify v1.9.0 // indirect
39+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
4040
github.com/go-errors/errors v1.5.1 // indirect
4141
github.com/go-logr/stdr v1.2.2 // indirect
4242
github.com/go-logr/zapr v1.3.0 // indirect
43-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
43+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4444
github.com/go-openapi/jsonreference v0.21.0 // indirect
45-
github.com/go-openapi/swag v0.23.0 // indirect
45+
github.com/go-openapi/swag v0.23.1 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4847
github.com/golang/protobuf v1.5.4 // indirect
4948
github.com/google/btree v1.1.3 // indirect
50-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
49+
github.com/google/gnostic-models v0.6.9 // indirect
5150
github.com/google/go-cmp v0.7.0 // indirect
5251
github.com/google/gofuzz v1.2.0 // indirect
5352
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5453
github.com/google/uuid v1.6.0 // indirect
5554
github.com/gorilla/websocket v1.5.3 // indirect
5655
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
58-
github.com/imdario/mergo v0.3.16 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
5957
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6058
github.com/josharian/intern v1.0.0 // indirect
6159
github.com/json-iterator/go v1.1.12 // indirect
62-
github.com/klauspost/compress v1.17.10 // indirect
6360
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
64-
github.com/mailru/easyjson v0.7.7 // indirect
61+
github.com/mailru/easyjson v0.9.0 // indirect
6562
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6663
github.com/moby/spdystream v0.5.0 // indirect
67-
github.com/moby/term v0.5.0 // indirect
64+
github.com/moby/term v0.5.2 // indirect
6865
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6966
github.com/modern-go/reflect2 v1.0.2 // indirect
7067
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7168
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7269
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7370
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7471
github.com/pkg/errors v0.9.1 // indirect
75-
github.com/prometheus/client_golang v1.20.4 // indirect
76-
github.com/prometheus/client_model v0.6.1 // indirect
77-
github.com/prometheus/common v0.59.1 // indirect
78-
github.com/prometheus/procfs v0.15.1 // indirect
72+
github.com/prometheus/client_golang v1.22.0 // indirect
73+
github.com/prometheus/client_model v0.6.2 // indirect
74+
github.com/prometheus/common v0.63.0 // indirect
75+
github.com/prometheus/procfs v0.16.0 // indirect
7976
github.com/russross/blackfriday/v2 v2.1.0 // indirect
80-
github.com/spf13/cobra v1.8.1 // indirect
81-
github.com/stretchr/objx v0.5.2 // indirect
77+
github.com/spf13/cobra v1.9.1 // indirect
8278
github.com/x448/float16 v0.8.4 // indirect
8379
github.com/xlab/treeprint v1.2.0 // indirect
8480
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8581
go.opentelemetry.io/otel/metric v1.35.0 // indirect
8682
go.opentelemetry.io/otel/trace v1.35.0 // indirect
8783
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
88-
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
8984
go.uber.org/multierr v1.11.0 // indirect
9085
go.uber.org/zap v1.27.0 // indirect
91-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
92-
golang.org/x/net v0.35.0 // indirect
93-
golang.org/x/oauth2 v0.26.0 // indirect
94-
golang.org/x/sync v0.11.0 // indirect
95-
golang.org/x/sys v0.30.0 // indirect
96-
golang.org/x/term v0.29.0 // indirect
97-
golang.org/x/text v0.22.0 // indirect
98-
golang.org/x/time v0.6.0 // indirect
99-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
100-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
101-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
102-
google.golang.org/protobuf v1.36.5 // indirect
86+
golang.org/x/net v0.39.0 // indirect
87+
golang.org/x/oauth2 v0.29.0 // indirect
88+
golang.org/x/sync v0.13.0 // indirect
89+
golang.org/x/sys v0.32.0 // indirect
90+
golang.org/x/term v0.31.0 // indirect
91+
golang.org/x/text v0.24.0 // indirect
92+
golang.org/x/time v0.11.0 // indirect
93+
golang.org/x/tools v0.32.0 // indirect
94+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
95+
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
96+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
97+
google.golang.org/protobuf v1.36.6 // indirect
10398
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
10499
gopkg.in/inf.v0 v0.9.1 // indirect
105-
gopkg.in/yaml.v2 v2.4.0 // indirect
106100
gopkg.in/yaml.v3 v3.0.1 // indirect
107-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
108-
k8s.io/cli-runtime v0.31.1 // indirect
109-
k8s.io/component-base v0.31.1 // indirect
101+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
102+
k8s.io/cli-runtime v0.32.3 // indirect
103+
k8s.io/component-base v0.32.3 // indirect
110104
k8s.io/klog/v2 v2.130.1 // indirect
111-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
112-
k8s.io/kubectl v0.31.1 // indirect
113-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
114-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
115-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
116-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
117-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
105+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
106+
k8s.io/kubectl v0.32.3 // indirect
107+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
108+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
109+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
110+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
111+
sigs.k8s.io/randfill v1.0.0 // indirect
112+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
118113
sigs.k8s.io/yaml v1.4.0 // indirect
119114
)

0 commit comments

Comments
 (0)