Skip to content

Commit 83b07d5

Browse files
Merge pull request #62 from nrb/127-update
OCPCLOUD-2057: Bump to Kubernetes 1.27 deps
2 parents 1259f29 + 78ebdc0 commit 83b07d5

File tree

1,004 files changed

+80179
-56788
lines changed

Some content is hidden

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

1,004 files changed

+80179
-56788
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags -static
2727
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.19
2828

2929
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30-
ENVTEST_K8S_VERSION = 1.26
30+
ENVTEST_K8S_VERSION = 1.27
3131

3232
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3333
CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen

go.mod

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,29 @@ require (
88
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
99
github.com/Azure/go-autorest/autorest/to v0.4.0
1010
github.com/ghodss/yaml v1.0.0
11-
github.com/go-logr/logr v1.2.3
11+
github.com/go-logr/logr v1.2.4
1212
github.com/golang/mock v1.6.0
1313
github.com/google/go-cmp v0.5.9
1414
github.com/hashicorp/golang-lru v0.5.4
1515
github.com/mitchellh/mapstructure v1.5.0
16-
github.com/onsi/ginkgo/v2 v2.8.1
17-
github.com/onsi/gomega v1.26.0
18-
github.com/openshift/api v0.0.0-20230213202419-42edf4f1d905
19-
github.com/openshift/machine-api-operator v0.2.1-0.20230214202016-9d54a2c6e9a2
16+
github.com/onsi/ginkgo/v2 v2.9.5
17+
github.com/onsi/gomega v1.27.7
18+
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
19+
github.com/openshift/machine-api-operator v0.2.1-0.20230526095704-3938d727319b
2020
github.com/pkg/errors v0.9.1
21-
github.com/spf13/cobra v1.6.1
21+
github.com/spf13/cobra v1.7.0
2222
golang.org/x/crypto v0.6.0
23+
golang.org/x/net v0.10.0 // indirect
2324

24-
// kube 1.26
25-
k8s.io/api v0.26.1
26-
k8s.io/apimachinery v0.26.1
27-
k8s.io/client-go v0.26.1
28-
k8s.io/klog/v2 v2.90.0
29-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
30-
sigs.k8s.io/controller-runtime v0.14.4
31-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230214165931-2ebab48c37db
32-
sigs.k8s.io/controller-tools v0.11.3
25+
// kube 1.27
26+
k8s.io/api v0.27.2
27+
k8s.io/apimachinery v0.27.2
28+
k8s.io/client-go v0.27.2
29+
k8s.io/klog/v2 v2.100.1
30+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
31+
sigs.k8s.io/controller-runtime v0.15.0
32+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230523032821-116a1b831fff
33+
sigs.k8s.io/controller-tools v0.12.0
3334
sigs.k8s.io/yaml v1.3.0
3435
)
3536

@@ -57,19 +58,19 @@ require (
5758
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5859
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5960
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
60-
github.com/fatih/color v1.14.1 // indirect
61+
github.com/fatih/color v1.15.0 // indirect
6162
github.com/fsnotify/fsnotify v1.6.0 // indirect
62-
github.com/go-errors/errors v1.0.1 // indirect
63-
github.com/go-logr/zapr v1.2.3 // indirect
64-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
65-
github.com/go-openapi/jsonreference v0.20.0 // indirect
63+
github.com/go-errors/errors v1.4.2 // indirect
64+
github.com/go-logr/zapr v1.2.4 // indirect
65+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
66+
github.com/go-openapi/jsonreference v0.20.1 // indirect
6667
github.com/go-openapi/swag v0.22.3 // indirect
67-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
68-
github.com/gobuffalo/flect v0.3.0 // indirect
68+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
69+
github.com/gobuffalo/flect v1.0.2 // indirect
6970
github.com/gogo/protobuf v1.3.2 // indirect
7071
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
7172
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
72-
github.com/golang/protobuf v1.5.2 // indirect
73+
github.com/golang/protobuf v1.5.3 // indirect
7374
github.com/google/btree v1.0.1 // indirect
7475
github.com/google/gnostic v0.6.9 // indirect
7576
github.com/google/gofuzz v1.2.0 // indirect
@@ -81,7 +82,6 @@ require (
8182
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8283
github.com/josharian/intern v1.0.0 // indirect
8384
github.com/json-iterator/go v1.1.12 // indirect
84-
github.com/kr/pretty v0.3.0 // indirect
8585
github.com/kylelemons/godebug v1.1.0 // indirect
8686
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8787
github.com/mailru/easyjson v0.7.7 // indirect
@@ -90,20 +90,19 @@ require (
9090
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
9191
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
9292
github.com/moby/spdystream v0.2.0 // indirect
93-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
93+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
9494
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9595
github.com/modern-go/reflect2 v1.0.2 // indirect
9696
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9797
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
98-
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 // indirect
99-
github.com/openshift/library-go v0.0.0-20230130232623-47904dd9ff5a // indirect
98+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb // indirect
99+
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf // indirect
100100
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
101101
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
102-
github.com/prometheus/client_golang v1.14.0 // indirect
103-
github.com/prometheus/client_model v0.3.0 // indirect
104-
github.com/prometheus/common v0.39.0 // indirect
102+
github.com/prometheus/client_golang v1.15.1 // indirect
103+
github.com/prometheus/client_model v0.4.0 // indirect
104+
github.com/prometheus/common v0.42.0 // indirect
105105
github.com/prometheus/procfs v0.9.0 // indirect
106-
github.com/rogpeppe/go-internal v1.9.0 // indirect
107106
github.com/russross/blackfriday/v2 v2.1.0 // indirect
108107
github.com/spf13/afero v1.9.3 // indirect
109108
github.com/spf13/pflag v1.0.5 // indirect
@@ -112,27 +111,26 @@ require (
112111
go.uber.org/atomic v1.10.0 // indirect
113112
go.uber.org/multierr v1.9.0 // indirect
114113
go.uber.org/zap v1.24.0 // indirect
115-
golang.org/x/mod v0.8.0 // indirect
116-
golang.org/x/net v0.7.0 // indirect
117-
golang.org/x/oauth2 v0.3.0 // indirect
118-
golang.org/x/sys v0.5.0 // indirect
119-
golang.org/x/term v0.5.0 // indirect
120-
golang.org/x/text v0.7.0 // indirect
114+
golang.org/x/mod v0.10.0 // indirect
115+
golang.org/x/oauth2 v0.6.0 // indirect
116+
golang.org/x/sys v0.8.0 // indirect
117+
golang.org/x/term v0.8.0 // indirect
118+
golang.org/x/text v0.9.0 // indirect
121119
golang.org/x/time v0.3.0 // indirect
122-
golang.org/x/tools v0.6.0 // indirect
123-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
120+
golang.org/x/tools v0.9.1 // indirect
121+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
124122
google.golang.org/appengine v1.6.7 // indirect
125-
google.golang.org/protobuf v1.28.1 // indirect
123+
google.golang.org/protobuf v1.30.0 // indirect
126124
gopkg.in/inf.v0 v0.9.1 // indirect
127125
gopkg.in/yaml.v2 v2.4.0 // indirect
128126
gopkg.in/yaml.v3 v3.0.1 // indirect
129-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
130-
k8s.io/cli-runtime v0.26.1 // indirect
131-
k8s.io/component-base v0.26.1 // indirect
132-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
133-
k8s.io/kubectl v0.26.1 // indirect
134-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
135-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
136-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
127+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
128+
k8s.io/cli-runtime v0.27.1 // indirect
129+
k8s.io/component-base v0.27.2 // indirect
130+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
131+
k8s.io/kubectl v0.27.1 // indirect
132+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
133+
sigs.k8s.io/kustomize/api v0.13.4 // indirect
134+
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
137135
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
138136
)

0 commit comments

Comments
 (0)