Skip to content

Commit 280dbc2

Browse files
Merge pull request #138 from razo7/update-golang-1.23
Bump Golang version v1.23 and Ginkgo
2 parents 3a288a3 + b75f473 commit 280dbc2

File tree

248 files changed

+13976
-6125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+13976
-6125
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
namespace: openshift
33
name: release
4-
tag: golang-1.20
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ OPM_VERSION ?= v1.35.0
1515
# See github.com/operator-framework/operator-sdk/releases for the last version
1616
OPERATOR_SDK_VERSION ?= v1.32.0
1717
# GO_VERSION refers to the version of Golang to be downloaded when running dockerized version
18-
GO_VERSION = 1.20
18+
GO_VERSION = 1.23
1919
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
2020
ENVTEST_K8S_VERSION = 1.28
2121
# See https://github.com/slintes/sort-imports/releases for the last version
2222
SORT_IMPORTS_VERSION = v0.2.1
2323
# OCP Version: for OKD bundle community
24-
OCP_VERSION ?= 4.12
24+
OCP_VERSION ?= 4.14
2525
# update for major version updates to YQ_VERSION! see https://github.com/mikefarah/yq
2626
# NOTE: v4.42.1 is the latest supporting go 1.20
2727
YQ_API_VERSION = v4

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/medik8s/node-maintenance-operator
22

3-
go 1.20
3+
go 1.23
44

55
require (
6-
github.com/go-logr/logr v1.4.1
7-
github.com/medik8s/common v1.15.1
8-
github.com/onsi/ginkgo/v2 v2.14.0
9-
github.com/onsi/gomega v1.30.0
6+
github.com/go-logr/logr v1.4.2
7+
github.com/medik8s/common v1.17.0
8+
github.com/onsi/ginkgo/v2 v2.22.0
9+
github.com/onsi/gomega v1.34.2
1010
github.com/sirupsen/logrus v1.9.3
1111
go.uber.org/zap v1.25.0
1212
k8s.io/api v0.29.0
@@ -36,15 +36,15 @@ require (
3636
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3737
github.com/go-openapi/jsonreference v0.20.2 // indirect
3838
github.com/go-openapi/swag v0.22.3 // indirect
39-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
39+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4040
github.com/gogo/protobuf v1.3.2 // indirect
4141
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4242
github.com/golang/protobuf v1.5.3 // indirect
4343
github.com/google/btree v1.0.1 // indirect
4444
github.com/google/gnostic-models v0.6.8 // indirect
4545
github.com/google/go-cmp v0.6.0 // indirect
4646
github.com/google/gofuzz v1.2.0 // indirect
47-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
47+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4848
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4949
github.com/google/uuid v1.3.0 // indirect
5050
github.com/gorilla/websocket v1.5.0 // indirect
@@ -77,17 +77,17 @@ require (
7777
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
7878
go.uber.org/multierr v1.11.0 // indirect
7979
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
80-
golang.org/x/net v0.23.0 // indirect
80+
golang.org/x/net v0.30.0 // indirect
8181
golang.org/x/oauth2 v0.10.0 // indirect
82-
golang.org/x/sync v0.5.0 // indirect
83-
golang.org/x/sys v0.18.0 // indirect
84-
golang.org/x/term v0.18.0 // indirect
85-
golang.org/x/text v0.14.0 // indirect
82+
golang.org/x/sync v0.8.0 // indirect
83+
golang.org/x/sys v0.26.0 // indirect
84+
golang.org/x/term v0.25.0 // indirect
85+
golang.org/x/text v0.19.0 // indirect
8686
golang.org/x/time v0.3.0 // indirect
87-
golang.org/x/tools v0.16.1 // indirect
87+
golang.org/x/tools v0.26.0 // indirect
8888
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8989
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/protobuf v1.33.0 // indirect
90+
google.golang.org/protobuf v1.34.1 // indirect
9191
gopkg.in/inf.v0 v0.9.1 // indirect
9292
gopkg.in/yaml.v2 v2.4.0 // indirect
9393
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 34 additions & 29 deletions
Large diffs are not rendered by default.

vendor/github.com/go-logr/logr/README.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/logr/funcr/funcr.go

Lines changed: 86 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.

vendor/github.com/go-task/slim-sprig/CHANGELOG.md renamed to vendor/github.com/go-task/slim-sprig/v3/CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)