Skip to content

Commit a5e0e28

Browse files
bump java sdk and k8s versions (#6044)
* rebase Signed-off-by: laxmikantbpandhare <[email protected]> updated changelog Signed-off-by: laxmikantbpandhare <[email protected]> missong go.sum entry for controller runtime updated sdk bumps Signed-off-by: laxmikantbpandhare <[email protected]> * added changelog Signed-off-by: laxmikantbpandhare <[email protected]> * added changelog Signed-off-by: laxmikantbpandhare <[email protected]> Signed-off-by: laxmikantbpandhare <[email protected]>
1 parent 5e1fb9d commit a5e0e28

File tree

3 files changed

+155
-209
lines changed

3 files changed

+155
-209
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
For Go (go/v3), Helm Hybrid (hybrid.helm/v1-alpha), and Quarkus(quarkus/v1-alpha) language based operators:
6+
Upgrade Kubernetes dependencies from `1.24` to `1.25`
7+
8+
# kind is one of:
9+
# - addition
10+
# - change
11+
# - deprecation
12+
# - removal
13+
# - bugfix
14+
kind: "change"
15+
16+
# Is this a breaking change?
17+
breaking: false

go.mod

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ go 1.19
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/fatih/structtag v1.1.0
8-
github.com/go-logr/logr v1.2.2
8+
github.com/go-logr/logr v1.2.3
99
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
1010
github.com/iancoleman/strcase v0.2.0
1111
github.com/kr/text v0.2.0
1212
github.com/markbates/inflect v1.0.4
1313
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
1414
github.com/onsi/ginkgo/v2 v2.2.0
1515
github.com/onsi/gomega v1.20.2
16-
github.com/operator-framework/api v0.15.1-0.20220624132056-decf74800a17
16+
github.com/operator-framework/api v0.17.2-0.20221006132308-b527a19c8e14
1717
github.com/operator-framework/helm-operator-plugins v0.0.12-0.20220616200420-1a695cb9f6a1
18-
github.com/operator-framework/java-operator-plugins v0.6.0
19-
github.com/operator-framework/operator-lib v0.11.0
20-
github.com/operator-framework/operator-manifest-tools v0.2.1
21-
github.com/operator-framework/operator-registry v1.23.0
22-
github.com/prometheus/client_golang v1.12.1
18+
github.com/operator-framework/java-operator-plugins v0.7.1-0.20221007075838-2e24140314fb
19+
github.com/operator-framework/operator-lib v0.11.1-0.20220921174810-791cc547e6c5
20+
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20220901033859-2a7ce32ef673
21+
github.com/operator-framework/operator-registry v1.26.3-0.20220930210947-614d6a955dc0
22+
github.com/prometheus/client_golang v1.12.2
2323
github.com/prometheus/client_model v0.2.0
2424
github.com/sergi/go-diff v1.2.0
2525
github.com/sirupsen/logrus v1.9.0
@@ -34,15 +34,15 @@ require (
3434
golang.org/x/tools v0.1.12
3535
gomodules.xyz/jsonpatch/v3 v3.0.1
3636
helm.sh/helm/v3 v3.9.0
37-
k8s.io/api v0.24.2
38-
k8s.io/apiextensions-apiserver v0.24.2
39-
k8s.io/apimachinery v0.24.2
40-
k8s.io/cli-runtime v0.24.1
41-
k8s.io/client-go v0.24.2
42-
k8s.io/kubectl v0.24.1
43-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
44-
sigs.k8s.io/controller-runtime v0.12.2
45-
sigs.k8s.io/controller-tools v0.9.2
37+
k8s.io/api v0.25.0
38+
k8s.io/apiextensions-apiserver v0.25.0
39+
k8s.io/apimachinery v0.25.0
40+
k8s.io/cli-runtime v0.25.0
41+
k8s.io/client-go v0.25.0
42+
k8s.io/kubectl v0.25.0
43+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
44+
sigs.k8s.io/controller-runtime v0.13.0
45+
sigs.k8s.io/controller-tools v0.10.0
4646
sigs.k8s.io/kubebuilder/v3 v3.7.1-0.20221011212440-eff842a46496
4747
sigs.k8s.io/yaml v1.3.0
4848
)
@@ -51,13 +51,13 @@ require (
5151
cloud.google.com/go v0.99.0 // indirect
5252
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5353
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
54-
github.com/Azure/go-autorest/autorest v0.11.20 // indirect
55-
github.com/Azure/go-autorest/autorest/adal v0.9.15 // indirect
54+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
55+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
5656
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5757
github.com/Azure/go-autorest/logger v0.2.1 // indirect
5858
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
5959
github.com/BurntSushi/toml v1.0.0 // indirect
60-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
60+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6161
github.com/Masterminds/goutils v1.1.1 // indirect
6262
github.com/Masterminds/semver/v3 v3.1.1 // indirect
6363
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -68,18 +68,17 @@ require (
6868
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
6969
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
7070
github.com/adrg/xdg v0.4.0 // indirect
71-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
71+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
7272
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
7373
github.com/beorn7/perks v1.0.1 // indirect
74-
github.com/blang/semver v3.5.1+incompatible // indirect
7574
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
7675
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
7776
github.com/bugsnag/panicwrap v1.2.0 // indirect
7877
github.com/cespare/xxhash/v2 v2.1.2 // indirect
79-
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
80-
github.com/containerd/cgroups v1.0.2 // indirect
78+
github.com/chai2010/gettext-go v1.0.2 // indirect
79+
github.com/containerd/cgroups v1.0.3 // indirect
8180
github.com/containerd/containerd v1.6.3 // indirect
82-
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
81+
github.com/containerd/continuity v0.1.0 // indirect
8382
github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect
8483
github.com/containerd/ttrpc v1.1.0 // indirect
8584
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
@@ -95,19 +94,20 @@ require (
9594
github.com/docker/go-metrics v0.0.1 // indirect
9695
github.com/docker/go-units v0.4.0 // indirect
9796
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
98-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
97+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
9998
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
99+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
100100
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
101101
github.com/fatih/color v1.13.0 // indirect
102102
github.com/felixge/httpsnoop v1.0.1 // indirect
103-
github.com/fsnotify/fsnotify v1.5.1 // indirect
103+
github.com/fsnotify/fsnotify v1.5.4 // indirect
104104
github.com/ghodss/yaml v1.0.0 // indirect
105105
github.com/go-errors/errors v1.0.1 // indirect
106106
github.com/go-git/gcfg v1.5.0 // indirect
107107
github.com/go-git/go-billy/v5 v5.1.0 // indirect
108108
github.com/go-git/go-git/v5 v5.3.0 // indirect
109109
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
110-
github.com/go-logr/zapr v1.2.0 // indirect
110+
github.com/go-logr/zapr v1.2.3 // indirect
111111
github.com/go-openapi/jsonpointer v0.19.5 // indirect
112112
github.com/go-openapi/jsonreference v0.19.5 // indirect
113113
github.com/go-openapi/swag v0.19.14 // indirect
@@ -116,13 +116,13 @@ require (
116116
github.com/gobwas/glob v0.2.3 // indirect
117117
github.com/gofrs/uuid v4.0.0+incompatible // indirect
118118
github.com/gogo/protobuf v1.3.2 // indirect
119-
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
119+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
120120
github.com/golang-migrate/migrate/v4 v4.6.2 // indirect
121121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
122122
github.com/golang/protobuf v1.5.2 // indirect
123123
github.com/gomodule/redigo v1.8.2 // indirect
124124
github.com/google/btree v1.0.1 // indirect
125-
github.com/google/cel-go v0.10.1 // indirect
125+
github.com/google/cel-go v0.12.4 // indirect
126126
github.com/google/gnostic v0.5.7-v3refs // indirect
127127
github.com/google/go-cmp v0.5.8 // indirect
128128
github.com/google/go-containerregistry v0.8.0 // indirect
@@ -162,7 +162,6 @@ require (
162162
github.com/mitchellh/copystructure v1.2.0 // indirect
163163
github.com/mitchellh/go-homedir v1.1.0 // indirect
164164
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
165-
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
166165
github.com/mitchellh/mapstructure v1.4.3 // indirect
167166
github.com/mitchellh/reflectwalk v1.0.2 // indirect
168167
github.com/moby/spdystream v0.2.0 // indirect
@@ -195,7 +194,7 @@ require (
195194
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
196195
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
197196
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
198-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
197+
github.com/xlab/treeprint v1.1.0 // indirect
199198
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
200199
github.com/yvasiyarov/gorelic v0.0.7 // indirect
201200
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
@@ -214,35 +213,35 @@ require (
214213
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
215214
go.uber.org/atomic v1.7.0 // indirect
216215
go.uber.org/multierr v1.6.0 // indirect
217-
go.uber.org/zap v1.19.1 // indirect
216+
go.uber.org/zap v1.21.0 // indirect
218217
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
219218
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
220219
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
221220
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
222221
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
223222
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
224-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
223+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
225224
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
226225
gomodules.xyz/orderedmap v0.1.0 // indirect
227226
google.golang.org/appengine v1.6.7 // indirect
228-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
229-
google.golang.org/grpc v1.45.0 // indirect
227+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
228+
google.golang.org/grpc v1.47.0 // indirect
230229
google.golang.org/protobuf v1.28.0 // indirect
231230
gopkg.in/inf.v0 v0.9.1 // indirect
232231
gopkg.in/ini.v1 v1.66.2 // indirect
233232
gopkg.in/warnings.v0 v0.1.2 // indirect
234233
gopkg.in/yaml.v2 v2.4.0 // indirect
235234
gopkg.in/yaml.v3 v3.0.1 // indirect
236-
k8s.io/apiserver v0.24.2 // indirect
237-
k8s.io/component-base v0.24.2 // indirect
238-
k8s.io/klog/v2 v2.60.1 // indirect
239-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
235+
k8s.io/apiserver v0.25.0 // indirect
236+
k8s.io/component-base v0.25.0 // indirect
237+
k8s.io/klog/v2 v2.70.1 // indirect
238+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
240239
oras.land/oras-go v1.1.0 // indirect
241-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
242-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
243-
sigs.k8s.io/kustomize/api v0.11.4 // indirect
244-
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
245-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
240+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
241+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
242+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
243+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
244+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
246245
)
247246

248247
replace (

0 commit comments

Comments
 (0)