Skip to content

Commit 3738d84

Browse files
TomerFiTomerFi
committed
build: bump go to 1.23 and bump dependencies and tools
Signed-off-by: Tomer Figenblat <[email protected]>
1 parent a43d25e commit 3738d84

File tree

5 files changed

+135
-131
lines changed

5 files changed

+135
-131
lines changed

‎.github/workflows/operator_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install go
4141
uses: actions/setup-go@v5
4242
with:
43-
go-version: '~1.22'
43+
go-version: '~1.23'
4444

4545
- name: Verify tidy
4646
run: |

‎Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
1+
FROM registry.access.redhat.com/ubi10/go-toolset:1.23 as builder
22

33
USER root
44
WORKDIR /rdrtrigger
@@ -7,7 +7,7 @@ COPY . .
77
RUN make build LOCALBUILD=internal_build
88
USER default
99

10-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
10+
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.0
1111

1212
USER root
1313
COPY --from=builder /rdrtrigger/internal_build/rdrtrigger /usr/bin/rdrtrigger

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ BIN_HELM ?= $(LOCALBIN)/helm##@ Set custom 'helm', if not supplied will install
6161
################################################
6262
###### Downloaded tools version variables ######
6363
################################################
64-
VERSION_CONTROLLER_GEN = v0.16.5
64+
VERSION_CONTROLLER_GEN = v0.17.3
6565
VERSION_OPERATOR_SDK = v1.39.2
6666
VERSION_KUSTOMIZE = v5.6.0
67-
VERSION_GO_TEST_COVERAGE = v2.8.2
68-
VERSION_GOLANG_CI_LINT = v1.59.1
67+
VERSION_GO_TEST_COVERAGE = v2.12.0
68+
VERSION_GOLANG_CI_LINT = v2.1.6
6969
VERSION_HELM = v3.17.0
70-
VERSION_ENVTEST = release-0.19
70+
VERSION_ENVTEST = release-0.20
7171

7272
#####################################
7373
###### Build related variables ######
@@ -277,7 +277,7 @@ $(BIN_ENVTEST): $(LOCALBIN)
277277
GOBIN=$(LOCALBIN) $(REQ_BIN_GO) install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(VERSION_ENVTEST)
278278

279279
$(BIN_GOLINTCI): $(LOCALBIN)
280-
GOBIN=$(LOCALBIN) $(REQ_BIN_GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@$(VERSION_GOLANG_CI_LINT)
280+
GOBIN=$(LOCALBIN) $(REQ_BIN_GO) install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(VERSION_GOLANG_CI_LINT)
281281

282282
$(BIN_OPERATOR_SDK): $(LOCALBIN)
283283
@$(call verify-essential-tool,$(REQ_BIN_CURL),REQ_BIN_CURL)

‎go.mod

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
module regional-dr-trigger-operator
22

3-
go 1.22.8
3+
go 1.23.0
44

55
toolchain go1.24.2
66

77
require (
8-
github.com/onsi/ginkgo/v2 v2.22.1
9-
github.com/onsi/gomega v1.36.1
10-
github.com/prometheus/client_golang v1.20.5
8+
github.com/onsi/ginkgo/v2 v2.23.4
9+
github.com/onsi/gomega v1.37.0
10+
github.com/prometheus/client_golang v1.22.0
1111
github.com/ramendr/ramen/api v0.0.0-20240924121439-b7cba82de417
12-
github.com/spf13/cobra v1.8.1
13-
k8s.io/api v0.31.2
14-
k8s.io/apimachinery v0.31.2
15-
k8s.io/component-base v0.31.2
16-
open-cluster-management.io/api v0.15.0
17-
sigs.k8s.io/controller-runtime v0.19.1
12+
github.com/spf13/cobra v1.9.1
13+
k8s.io/api v0.32.5
14+
k8s.io/apimachinery v0.32.5
15+
k8s.io/component-base v0.32.5
16+
open-cluster-management.io/api v0.16.2
17+
sigs.k8s.io/controller-runtime v0.20.4
1818
)
1919

2020
replace (
21-
k8s.io/apiserver => k8s.io/apiserver v0.31.2
22-
k8s.io/client-go => k8s.io/client-go v0.31.2
21+
k8s.io/apiserver => k8s.io/apiserver v0.32.5
22+
k8s.io/client-go => k8s.io/client-go v0.32.5
2323
)
2424

2525
require (
26+
cel.dev/expr v0.18.0 // indirect
2627
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2728
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2829
github.com/beorn7/perks v1.0.1 // indirect
@@ -32,7 +33,7 @@ require (
3233
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3334
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3435
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
35-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
36+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3637
github.com/felixge/httpsnoop v1.0.4 // indirect
3738
github.com/fsnotify/fsnotify v1.7.0 // indirect
3839
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -44,30 +45,28 @@ require (
4445
github.com/go-openapi/swag v0.23.0 // indirect
4546
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4647
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4848
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/cel-go v0.20.1 // indirect
49+
github.com/google/btree v1.1.3 // indirect
50+
github.com/google/cel-go v0.22.0 // indirect
5051
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
51-
github.com/google/go-cmp v0.6.0 // indirect
52+
github.com/google/go-cmp v0.7.0 // indirect
5253
github.com/google/gofuzz v1.2.0 // indirect
53-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
54+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5455
github.com/google/uuid v1.6.0 // indirect
5556
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
56-
github.com/imdario/mergo v0.3.16 // indirect
5757
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5858
github.com/josharian/intern v1.0.0 // indirect
5959
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/klauspost/compress v1.17.10 // indirect
6160
github.com/mailru/easyjson v0.7.7 // indirect
6261
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6362
github.com/modern-go/reflect2 v1.0.2 // indirect
6463
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6564
github.com/pkg/errors v0.9.1 // indirect
6665
github.com/prometheus/client_model v0.6.1 // indirect
67-
github.com/prometheus/common v0.59.1 // indirect
66+
github.com/prometheus/common v0.62.0 // indirect
6867
github.com/prometheus/procfs v0.15.1 // indirect
69-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
70-
github.com/stoewer/go-strcase v1.2.0 // indirect
68+
github.com/spf13/pflag v1.0.6 // indirect
69+
github.com/stoewer/go-strcase v1.3.0 // indirect
7170
github.com/x448/float16 v0.8.4 // indirect
7271
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
7372
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -77,33 +76,34 @@ require (
7776
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
7877
go.opentelemetry.io/otel/trace v1.28.0 // indirect
7978
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
79+
go.uber.org/automaxprocs v1.6.0 // indirect
8080
go.uber.org/multierr v1.11.0 // indirect
8181
go.uber.org/zap v1.27.0 // indirect
8282
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
83-
golang.org/x/net v0.33.0 // indirect
84-
golang.org/x/oauth2 v0.23.0 // indirect
85-
golang.org/x/sync v0.10.0 // indirect
86-
golang.org/x/sys v0.28.0 // indirect
87-
golang.org/x/term v0.27.0 // indirect
88-
golang.org/x/text v0.21.0 // indirect
83+
golang.org/x/net v0.37.0 // indirect
84+
golang.org/x/oauth2 v0.24.0 // indirect
85+
golang.org/x/sync v0.12.0 // indirect
86+
golang.org/x/sys v0.32.0 // indirect
87+
golang.org/x/term v0.30.0 // indirect
88+
golang.org/x/text v0.23.0 // indirect
8989
golang.org/x/time v0.8.0 // indirect
90-
golang.org/x/tools v0.28.0 // indirect
90+
golang.org/x/tools v0.31.0 // indirect
9191
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
92-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
93-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
92+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
9494
google.golang.org/grpc v1.65.0 // indirect
95-
google.golang.org/protobuf v1.35.2 // indirect
95+
google.golang.org/protobuf v1.36.5 // indirect
96+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9697
gopkg.in/inf.v0 v0.9.1 // indirect
97-
gopkg.in/yaml.v2 v2.4.0 // indirect
9898
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
100-
k8s.io/apiserver v0.31.1 // indirect
99+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
100+
k8s.io/apiserver v0.32.1 // indirect
101101
k8s.io/client-go v12.0.0+incompatible // indirect
102102
k8s.io/klog/v2 v2.130.1 // indirect
103-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
104-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
105-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
106-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
103+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
104+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
106+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
107+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
108108
sigs.k8s.io/yaml v1.4.0 // indirect
109109
)

0 commit comments

Comments
 (0)