Skip to content

Commit c62a92c

Browse files
authored
Merge pull request #16 from christianwoehrle/main
fix: bump to Kubernetes 1.33 and Go 1.24
2 parents 7692e1e + a5c7588 commit c62a92c

8 files changed

Lines changed: 94 additions & 86 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: setup-go
1313
uses: actions/setup-go@v3
1414
with:
15-
go-version: '1.23'
15+
go-version: '1.24'
1616
- name: Run tests
1717
run: |
1818
make test

.github/workflows/e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
- name: Set up Go 1.x
99
uses: actions/setup-go@v3
1010
with:
11-
go-version: 1.23
11+
go-version: 1.24
1212
id: go
1313
- name: checkout project
1414
uses: actions/checkout@v3
1515
- name: start minikube
1616
uses: manusa/actions-setup-minikube@v2.13.1
1717
with:
1818
minikube version: 'v1.33.1'
19-
kubernetes version: 'v1.30.3'
19+
kubernetes version: 'v1.33.0'
2020
driver: 'docker'
2121
- name: configure Minikube
2222
run: |

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Set up Go 1.x
99
uses: actions/setup-go@v3
1010
with:
11-
go-version: 1.23
11+
go-version: 1.24
1212
id: go
1313
- name: Check out code into the Go module directory
1414
uses: actions/checkout@v3

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.4 AS builder
2+
FROM golang:1.24 AS builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

go.mod

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module github.com/movewp3/keycloakclient-controller
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.4
5+
toolchain go1.24.12
66

77
require (
88
github.com/json-iterator/go v1.1.12
9-
github.com/onsi/ginkgo/v2 v2.21.0
10-
github.com/onsi/gomega v1.35.1
9+
github.com/onsi/ginkgo/v2 v2.22.0
10+
github.com/onsi/gomega v1.36.1
1111
github.com/pkg/errors v0.9.1
12-
github.com/stretchr/testify v1.9.0
13-
k8s.io/api v0.32.0
14-
k8s.io/apiextensions-apiserver v0.32.0
15-
k8s.io/apimachinery v0.32.0
16-
k8s.io/client-go v0.32.0
12+
github.com/stretchr/testify v1.10.0
13+
k8s.io/api v0.33.7
14+
k8s.io/apiextensions-apiserver v0.33.7
15+
k8s.io/apimachinery v0.33.7
16+
k8s.io/client-go v0.33.7
1717
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
18-
sigs.k8s.io/controller-runtime v0.20.0
18+
sigs.k8s.io/controller-runtime v0.21.0
1919
)
2020

2121
require (
@@ -24,7 +24,7 @@ require (
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2626
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
27-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
27+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2828
github.com/fsnotify/fsnotify v1.7.0 // indirect
2929
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3030
github.com/go-logr/logr v1.4.2 // indirect
@@ -34,11 +34,9 @@ require (
3434
github.com/go-openapi/swag v0.23.0 // indirect
3535
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/protobuf v1.5.4 // indirect
3837
github.com/google/btree v1.1.3 // indirect
39-
github.com/google/gnostic-models v0.6.8 // indirect
40-
github.com/google/go-cmp v0.6.0 // indirect
41-
github.com/google/gofuzz v1.2.0 // indirect
38+
github.com/google/gnostic-models v0.6.9 // indirect
39+
github.com/google/go-cmp v0.7.0 // indirect
4240
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4341
github.com/google/uuid v1.6.0 // indirect
4442
github.com/josharian/intern v1.0.0 // indirect
@@ -47,30 +45,31 @@ require (
4745
github.com/modern-go/reflect2 v1.0.2 // indirect
4846
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4947
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
50-
github.com/prometheus/client_golang v1.19.1 // indirect
48+
github.com/prometheus/client_golang v1.22.0 // indirect
5149
github.com/prometheus/client_model v0.6.1 // indirect
52-
github.com/prometheus/common v0.55.0 // indirect
50+
github.com/prometheus/common v0.62.0 // indirect
5351
github.com/prometheus/procfs v0.15.1 // indirect
5452
github.com/spf13/pflag v1.0.5 // indirect
5553
github.com/x448/float16 v0.8.4 // indirect
5654
go.uber.org/multierr v1.11.0 // indirect
5755
go.uber.org/zap v1.27.0 // indirect
58-
golang.org/x/net v0.30.0 // indirect
59-
golang.org/x/oauth2 v0.23.0 // indirect
60-
golang.org/x/sync v0.8.0 // indirect
61-
golang.org/x/sys v0.26.0 // indirect
62-
golang.org/x/term v0.25.0 // indirect
63-
golang.org/x/text v0.19.0 // indirect
64-
golang.org/x/time v0.7.0 // indirect
56+
golang.org/x/net v0.38.0 // indirect
57+
golang.org/x/oauth2 v0.27.0 // indirect
58+
golang.org/x/sync v0.12.0 // indirect
59+
golang.org/x/sys v0.31.0 // indirect
60+
golang.org/x/term v0.30.0 // indirect
61+
golang.org/x/text v0.23.0 // indirect
62+
golang.org/x/time v0.9.0 // indirect
6563
golang.org/x/tools v0.26.0 // indirect
6664
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
67-
google.golang.org/protobuf v1.35.1 // indirect
65+
google.golang.org/protobuf v1.36.5 // indirect
6866
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6967
gopkg.in/inf.v0 v0.9.1 // indirect
7068
gopkg.in/yaml.v3 v3.0.1 // indirect
7169
k8s.io/klog/v2 v2.130.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
70+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7371
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
72+
sigs.k8s.io/randfill v1.0.0 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
7574
sigs.k8s.io/yaml v1.4.0 // indirect
7675
)

0 commit comments

Comments
 (0)