Skip to content

Commit d5cde0c

Browse files
Neo2308acornett21
Neo2308
and
acornett21
authored
Bump k8s dependencies to 1.30 (#102)
* Update k8s dependencies to 1.30 * Updated k8s dependencies to 1.30 * Updated kubebuilder to v4 * updating pip and piplock files Signed-off-by: Adam D. Cornett <[email protected]> * updating methods to comply with k8 1.30 Signed-off-by: Adam D. Cornett <[email protected]> * adding new metrics files Signed-off-by: Adam D. Cornett <[email protected]> * fixing generation issues Signed-off-by: Adam D. Cornett <[email protected]> * Attempting to fix tests Signed-off-by: Neo2308 <[email protected]> * Attempting to fix tests Signed-off-by: Neo2308 <[email protected]> * Attempting to fix tests Signed-off-by: Neo2308 <[email protected]> * Attempting to fix tests Signed-off-by: Neo2308 <[email protected]> * Attempting to fix tests Signed-off-by: Neo2308 <[email protected]> --------- Signed-off-by: Adam D. Cornett <[email protected]> Signed-off-by: Neo2308 <[email protected]> Co-authored-by: Adam D. Cornett <[email protected]>
1 parent 886b92a commit d5cde0c

File tree

86 files changed

+375
-334
lines changed

Some content is hidden

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

86 files changed

+375
-334
lines changed

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export IMAGE_VERSION = v1.35.0
99
export SIMPLE_VERSION := $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
1010
export GIT_VERSION := $(shell git describe --dirty --tags --always)
1111
export GIT_COMMIT := $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.29.0
12+
export K8S_VERSION = 1.30.0
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin

Diff for: ‎go.mod

+33-32
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
module github.com/operator-framework/ansible-operator-plugins
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.5
46

57
require (
68
github.com/go-logr/logr v1.4.1
79
github.com/kr/text v0.2.0
810
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
9-
github.com/onsi/ginkgo/v2 v2.17.3
11+
github.com/onsi/ginkgo/v2 v2.19.0
1012
github.com/onsi/gomega v1.33.1
11-
github.com/operator-framework/operator-lib v0.13.0
12-
github.com/operator-framework/operator-registry v1.39.0
13+
github.com/operator-framework/operator-lib v0.14.0
14+
github.com/operator-framework/operator-registry v1.42.0
1315
github.com/prometheus/client_golang v1.19.0
1416
github.com/prometheus/client_model v0.6.1
1517
github.com/sirupsen/logrus v1.9.3
1618
github.com/spf13/afero v1.11.0
17-
github.com/spf13/cobra v1.8.0
19+
github.com/spf13/cobra v1.8.1
1820
github.com/spf13/pflag v1.0.5
1921
github.com/spf13/viper v1.18.2
20-
github.com/stretchr/testify v1.8.4
21-
golang.org/x/text v0.15.0
22-
k8s.io/api v0.29.3
23-
k8s.io/apiextensions-apiserver v0.29.3
24-
k8s.io/apimachinery v0.29.3
25-
k8s.io/client-go v0.29.3
26-
k8s.io/kubectl v0.29.3
27-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
28-
sigs.k8s.io/controller-runtime v0.17.2
29-
sigs.k8s.io/kubebuilder/v3 v3.15.0
22+
github.com/stretchr/testify v1.9.0
23+
golang.org/x/text v0.16.0
24+
k8s.io/api v0.30.0
25+
k8s.io/apiextensions-apiserver v0.30.0
26+
k8s.io/apimachinery v0.30.0
27+
k8s.io/client-go v0.30.0
28+
k8s.io/kubectl v0.30.0
29+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
30+
sigs.k8s.io/controller-runtime v0.18.2
31+
sigs.k8s.io/kubebuilder/v4 v4.1.1
3032
sigs.k8s.io/yaml v1.4.0
3133
)
3234

@@ -38,18 +40,18 @@ require (
3840
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3941
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
4042
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
41-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4244
github.com/fsnotify/fsnotify v1.7.0 // indirect
4345
github.com/go-logr/zapr v1.3.0 // indirect
4446
github.com/go-openapi/jsonpointer v0.20.2 // indirect
4547
github.com/go-openapi/jsonreference v0.20.4 // indirect
46-
github.com/go-openapi/swag v0.22.9 // indirect
48+
github.com/go-openapi/swag v0.22.10 // indirect
4749
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4850
github.com/gobuffalo/flect v1.0.2 // indirect
4951
github.com/gogo/protobuf v1.3.2 // indirect
5052
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5153
github.com/golang/protobuf v1.5.4 // indirect
52-
github.com/google/cel-go v0.17.7 // indirect
54+
github.com/google/cel-go v0.17.8 // indirect
5355
github.com/google/gnostic-models v0.6.8 // indirect
5456
github.com/google/go-cmp v0.6.0 // indirect
5557
github.com/google/gofuzz v1.2.0 // indirect
@@ -69,7 +71,7 @@ require (
6971
github.com/modern-go/reflect2 v1.0.2 // indirect
7072
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7173
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
72-
github.com/operator-framework/api v0.23.0 // indirect
74+
github.com/operator-framework/api v0.24.0 // indirect
7375
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
7476
github.com/pkg/errors v0.9.1 // indirect
7577
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -83,28 +85,27 @@ require (
8385
github.com/subosito/gotenv v1.6.0 // indirect
8486
go.uber.org/multierr v1.11.0 // indirect
8587
go.uber.org/zap v1.26.0 // indirect
86-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
87-
golang.org/x/mod v0.17.0 // indirect
88-
golang.org/x/net v0.25.0 // indirect
89-
golang.org/x/oauth2 v0.17.0 // indirect
88+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
89+
golang.org/x/mod v0.19.0 // indirect
90+
golang.org/x/net v0.27.0 // indirect
91+
golang.org/x/oauth2 v0.18.0 // indirect
9092
golang.org/x/sync v0.7.0 // indirect
91-
golang.org/x/sys v0.20.0 // indirect
92-
golang.org/x/term v0.20.0 // indirect
93+
golang.org/x/sys v0.22.0 // indirect
94+
golang.org/x/term v0.22.0 // indirect
9395
golang.org/x/time v0.5.0 // indirect
94-
golang.org/x/tools v0.21.0 // indirect
96+
golang.org/x/tools v0.23.0 // indirect
9597
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9698
google.golang.org/appengine v1.6.8 // indirect
97-
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
98-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
99-
google.golang.org/grpc v1.61.1 // indirect
100-
google.golang.org/protobuf v1.33.0 // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
101+
google.golang.org/grpc v1.63.2 // indirect
102+
google.golang.org/protobuf v1.34.1 // indirect
101103
gopkg.in/inf.v0 v0.9.1 // indirect
102104
gopkg.in/ini.v1 v1.67.0 // indirect
103105
gopkg.in/yaml.v2 v2.4.0 // indirect
104106
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/component-base v0.29.3 // indirect
106107
k8s.io/klog/v2 v2.120.1 // indirect
107-
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect
108+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
108109
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109110
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
110111
)

0 commit comments

Comments
 (0)