Skip to content

Commit 583185f

Browse files
authored
fix: upgrade go and dependencies (#426)
1 parent e0ff22b commit 583185f

11 files changed

Lines changed: 649 additions & 407 deletions

File tree

.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
@@ -143,7 +143,7 @@ controller-gen: ## Download controller-gen locally if necessary.
143143
GOLANGCI_LINT = $(GOBIN)/golangci-lint
144144
.PHONY: golangci-lint
145145
golangci-lint: ## Download golint locally if necessary
146-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2)
146+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.2)
147147

148148
KUSTOMIZE = $(GOBIN)/kustomize
149149
.PHONY: kustomize

api/v1beta1/keycloakrealm_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ type RequestStatus struct {
176176
}
177177

178178
func KeycloakRealmReconciling(realm KeycloakRealm, status metav1.ConditionStatus, reason, message string) KeycloakRealm {
179-
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.ObjectMeta.Generation)
179+
setResourceCondition(&realm, ConditionReconciling, status, reason, message, realm.Generation)
180180
return realm
181181
}
182182

183183
func KeycloakRealmReady(realm KeycloakRealm, status metav1.ConditionStatus, reason, message string) KeycloakRealm {
184-
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.ObjectMeta.Generation)
184+
setResourceCondition(&realm, ConditionReady, status, reason, message, realm.Generation)
185185
return realm
186186
}
187187

chart/keycloak-controller/crds/keycloak.infra.doodle.com_keycloakrealms.yaml

Lines changed: 232 additions & 106 deletions
Large diffs are not rendered by default.

config/base/crd/bases/keycloak.infra.doodle.com_keycloakrealms.yaml

Lines changed: 232 additions & 106 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,73 @@
11
module github.com/DoodleScheduling/keycloak-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
88
github.com/kylelemons/godebug v1.1.0
9-
github.com/onsi/ginkgo/v2 v2.22.2
10-
github.com/onsi/gomega v1.36.2
9+
github.com/onsi/ginkgo/v2 v2.23.3
10+
github.com/onsi/gomega v1.37.0
1111
github.com/spf13/pflag v1.0.6
1212
github.com/stretchr/testify v1.10.0
1313
github.com/tj/assert v0.0.3
1414
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
1515
go.opentelemetry.io/otel v1.35.0
1616
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
1717
go.opentelemetry.io/otel/sdk v1.35.0
18-
google.golang.org/grpc v1.71.1
19-
k8s.io/api v0.31.3
20-
k8s.io/apiextensions-apiserver v0.31.3
21-
k8s.io/apimachinery v0.31.4
22-
k8s.io/client-go v0.31.3
23-
sigs.k8s.io/controller-runtime v0.19.4
18+
google.golang.org/grpc v1.71.0
19+
k8s.io/api v0.32.3
20+
k8s.io/apiextensions-apiserver v0.32.3
21+
k8s.io/apimachinery v0.32.3
22+
k8s.io/client-go v0.32.3
23+
sigs.k8s.io/controller-runtime v0.20.4
2424
)
2525

2626
require (
27-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
27+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2828
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
3131
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3232
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3333
github.com/chai2010/gettext-go v1.0.3 // indirect
3434
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
35-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
35+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3636
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
37-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
37+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3838
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
3939
github.com/felixge/httpsnoop v1.0.4 // indirect
40-
github.com/fluxcd/cli-utils v0.36.0-flux.9 // indirect
41-
github.com/fluxcd/pkg/apis/meta v1.6.1 // indirect
42-
github.com/fsnotify/fsnotify v1.7.0 // indirect
43-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40+
github.com/fluxcd/cli-utils v0.36.0-flux.12 // indirect
41+
github.com/fluxcd/pkg/apis/meta v1.10.0 // indirect
42+
github.com/fsnotify/fsnotify v1.9.0 // indirect
43+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
4444
github.com/go-errors/errors v1.5.1 // indirect
4545
github.com/go-logr/stdr v1.2.2 // indirect
4646
github.com/go-logr/zapr v1.3.0 // indirect
47-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
47+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4848
github.com/go-openapi/jsonreference v0.21.0 // indirect
49-
github.com/go-openapi/swag v0.23.0 // indirect
49+
github.com/go-openapi/swag v0.23.1 // indirect
5050
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5151
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5352
github.com/golang/protobuf v1.5.4 // indirect
54-
github.com/google/btree v1.1.2 // indirect
55-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
53+
github.com/google/btree v1.1.3 // indirect
54+
github.com/google/gnostic-models v0.6.9 // indirect
5655
github.com/google/go-cmp v0.7.0 // indirect
5756
github.com/google/gofuzz v1.2.0 // indirect
58-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
57+
github.com/google/pprof v0.0.0-20250128161936-077ca0a936bf // indirect
5958
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6059
github.com/google/uuid v1.6.0 // indirect
6160
github.com/gorilla/websocket v1.5.3 // indirect
6261
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
6362
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
64-
github.com/imdario/mergo v0.3.16 // indirect
6563
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6664
github.com/josharian/intern v1.0.0 // indirect
6765
github.com/json-iterator/go v1.1.12 // indirect
68-
github.com/klauspost/compress v1.17.9 // indirect
6966
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
70-
github.com/mailru/easyjson v0.7.7 // indirect
67+
github.com/mailru/easyjson v0.9.0 // indirect
7168
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
7269
github.com/moby/spdystream v0.5.0 // indirect
73-
github.com/moby/term v0.5.0 // indirect
70+
github.com/moby/term v0.5.2 // indirect
7471
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7572
github.com/modern-go/reflect2 v1.0.2 // indirect
7673
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -79,48 +76,46 @@ require (
7976
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8077
github.com/pkg/errors v0.9.1 // indirect
8178
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
82-
github.com/prometheus/client_golang v1.20.3 // indirect
83-
github.com/prometheus/client_model v0.6.1 // indirect
84-
github.com/prometheus/common v0.55.0 // indirect
85-
github.com/prometheus/procfs v0.15.1 // indirect
79+
github.com/prometheus/client_golang v1.22.0 // indirect
80+
github.com/prometheus/client_model v0.6.2 // indirect
81+
github.com/prometheus/common v0.63.0 // indirect
82+
github.com/prometheus/procfs v0.16.0 // indirect
8683
github.com/russross/blackfriday/v2 v2.1.0 // indirect
87-
github.com/spf13/cobra v1.8.1 // indirect
84+
github.com/spf13/cobra v1.9.1 // indirect
8885
github.com/x448/float16 v0.8.4 // indirect
8986
github.com/xlab/treeprint v1.2.0 // indirect
9087
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9188
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
9289
go.opentelemetry.io/otel/metric v1.35.0 // indirect
9390
go.opentelemetry.io/otel/trace v1.35.0 // indirect
9491
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
95-
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
9692
go.uber.org/multierr v1.11.0 // indirect
9793
go.uber.org/zap v1.27.0 // indirect
98-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
99-
golang.org/x/net v0.35.0 // indirect
100-
golang.org/x/oauth2 v0.26.0 // indirect
101-
golang.org/x/sync v0.11.0 // indirect
102-
golang.org/x/sys v0.30.0 // indirect
103-
golang.org/x/term v0.29.0 // indirect
104-
golang.org/x/text v0.22.0 // indirect
105-
golang.org/x/time v0.6.0 // indirect
106-
golang.org/x/tools v0.28.0 // indirect
107-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
94+
golang.org/x/net v0.39.0 // indirect
95+
golang.org/x/oauth2 v0.29.0 // indirect
96+
golang.org/x/sync v0.13.0 // indirect
97+
golang.org/x/sys v0.32.0 // indirect
98+
golang.org/x/term v0.31.0 // indirect
99+
golang.org/x/text v0.24.0 // indirect
100+
golang.org/x/time v0.11.0 // indirect
101+
golang.org/x/tools v0.32.0 // indirect
102+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
108103
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
109104
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
110-
google.golang.org/protobuf v1.36.5 // indirect
105+
google.golang.org/protobuf v1.36.6 // indirect
111106
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
112107
gopkg.in/inf.v0 v0.9.1 // indirect
113-
gopkg.in/yaml.v2 v2.4.0 // indirect
114108
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/cli-runtime v0.31.1 // indirect
116-
k8s.io/component-base v0.31.3 // indirect
109+
k8s.io/cli-runtime v0.32.3 // indirect
110+
k8s.io/component-base v0.32.3 // indirect
117111
k8s.io/klog/v2 v2.130.1 // indirect
118-
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect
119-
k8s.io/kubectl v0.31.1 // indirect
120-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
121-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
122-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
123-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
124-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
112+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
113+
k8s.io/kubectl v0.32.3 // indirect
114+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
115+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
116+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
117+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
118+
sigs.k8s.io/randfill v1.0.0 // indirect
119+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
125120
sigs.k8s.io/yaml v1.4.0 // indirect
126121
)

0 commit comments

Comments
 (0)