Skip to content

Commit 061fb4f

Browse files
authored
Upgrade the APIs version to support kubernetes 1.25 (#940)
* Fix the APIs version to support kubernetes 1.25
1 parent feb5a95 commit 061fb4f

File tree

19 files changed

+826
-312
lines changed

19 files changed

+826
-312
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
# [Unreleased](https://github.com/cockroachdb/cockroach-operator/compare/v2.9.0...master)
99

10+
## Added
11+
12+
* Upgrade the underlying k8s dependencies from 1.20 to 1.21 to support operator installation on k8s 1.25+.
13+
1014
# [v2.9.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.8.0...v2.9.0)
1115

1216
## Fixed

WORKSPACE

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,15 @@ container_pull(
108108
################################
109109
http_archive(
110110
name = "io_bazel_rules_k8s",
111-
sha256 = "51f0977294699cd547e139ceff2396c32588575588678d2054da167691a227ef",
112-
strip_prefix = "rules_k8s-0.6",
113-
urls = ["https://github.com/bazelbuild/rules_k8s/archive/v0.6.tar.gz"],
111+
sha256 = "ce5b9bc0926681e2e7f2147b49096f143e6cbc783e71bc1d4f36ca76b00e6f4a",
112+
strip_prefix = "rules_k8s-0.7",
113+
urls = ["https://github.com/bazelbuild/rules_k8s/archive/refs/tags/v0.7.tar.gz"],
114114
)
115115

116116
load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_repositories")
117117

118118
k8s_repositories()
119119

120-
load("@io_bazel_rules_k8s//k8s:k8s_go_deps.bzl", k8s_go_deps = "deps")
121-
122-
k8s_go_deps()
123-
124120
load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_defaults")
125121

126122
#############################################################

config/crd/bases/crdb.cockroachlabs.com_crdbclusters.yaml

Lines changed: 250 additions & 16 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,38 @@ go 1.17
55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.0
77
github.com/Masterminds/semver/v3 v3.1.0
8-
github.com/banzaicloud/k8s-objectmatcher v1.3.2
8+
github.com/banzaicloud/k8s-objectmatcher v1.8.0
99
github.com/cenkalti/backoff v2.2.1+incompatible
1010
github.com/cockroachdb/errors v1.8.0
1111
github.com/dnaeon/go-vcr v1.0.1
1212
github.com/dustin/go-humanize v1.0.0
13-
github.com/go-logr/logr v0.3.0
14-
github.com/go-logr/zapr v0.2.0
13+
github.com/go-logr/logr v0.4.0
14+
github.com/go-logr/zapr v0.4.0
1515
github.com/google/go-cmp v0.5.5
1616
github.com/gosimple/slug v1.9.0
1717
github.com/jackc/pgx/v4 v4.9.0
1818
github.com/lithammer/shortuuid/v3 v3.0.7
1919
github.com/octago/sflags v0.2.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.7.0
22-
go.uber.org/zap v1.15.0
22+
go.uber.org/zap v1.17.0
2323
gopkg.in/yaml.v2 v2.4.0
24-
k8s.io/api v0.20.2
25-
k8s.io/apimachinery v0.20.2
24+
k8s.io/api v0.21.2
25+
k8s.io/apimachinery v0.21.2
2626
k8s.io/client-go v9.0.0+incompatible
27-
k8s.io/code-generator v0.20.2
27+
k8s.io/code-generator v0.21.2
2828
k8s.io/klog v1.0.0
29-
k8s.io/klog/v2 v2.4.0
30-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
31-
sigs.k8s.io/controller-runtime v0.8.2
29+
k8s.io/klog/v2 v2.8.0
30+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
31+
sigs.k8s.io/controller-runtime v0.9.2
3232
sigs.k8s.io/controller-tools v0.5.0
3333
sigs.k8s.io/kubetest2 v0.0.0-20210720070532-ea531e01c240
3434
sigs.k8s.io/yaml v1.2.0
3535
)
3636

3737
require (
3838
cloud.google.com/go v0.75.0 // indirect
39+
emperror.dev/errors v0.8.0 // indirect
3940
github.com/PuerkitoBio/purell v1.1.1 // indirect
4041
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4142
github.com/beorn7/perks v1.0.1 // indirect
@@ -44,9 +45,8 @@ require (
4445
github.com/cockroachdb/redact v1.0.6 // indirect
4546
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
4647
github.com/davecgh/go-spew v1.1.1 // indirect
47-
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
4848
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
49-
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
49+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
5050
github.com/fatih/color v1.9.0 // indirect
5151
github.com/fsnotify/fsnotify v1.4.9 // indirect
5252
github.com/go-openapi/jsonpointer v0.19.3 // indirect
@@ -56,13 +56,12 @@ require (
5656
github.com/gobuffalo/flect v0.2.2 // indirect
5757
github.com/gogo/protobuf v1.3.2 // indirect
5858
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
59-
github.com/golang/protobuf v1.5.0 // indirect
59+
github.com/golang/protobuf v1.5.2 // indirect
6060
github.com/google/gofuzz v1.1.0 // indirect
6161
github.com/google/uuid v1.2.0 // indirect
62-
github.com/googleapis/gnostic v0.5.1 // indirect
63-
github.com/goph/emperror v0.17.2 // indirect
62+
github.com/googleapis/gnostic v0.5.5 // indirect
6463
github.com/hashicorp/golang-lru v0.5.4 // indirect
65-
github.com/imdario/mergo v0.3.11 // indirect
64+
github.com/imdario/mergo v0.3.12 // indirect
6665
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6766
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
6867
github.com/jackc/pgconn v1.7.0 // indirect
@@ -71,52 +70,52 @@ require (
7170
github.com/jackc/pgproto3/v2 v2.0.5 // indirect
7271
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
7372
github.com/jackc/pgtype v1.5.0 // indirect
74-
github.com/json-iterator/go v1.1.10 // indirect
73+
github.com/json-iterator/go v1.1.12 // indirect
7574
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
7675
github.com/kr/pretty v0.2.1 // indirect
7776
github.com/kr/text v0.2.0 // indirect
7877
github.com/mailru/easyjson v0.7.0 // indirect
7978
github.com/mattn/go-colorable v0.1.8 // indirect
8079
github.com/mattn/go-isatty v0.0.12 // indirect
8180
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
81+
github.com/moby/spdystream v0.2.0 // indirect
8282
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
83-
github.com/modern-go/reflect2 v1.0.1 // indirect
84-
github.com/onsi/gomega v1.10.3 // indirect
83+
github.com/modern-go/reflect2 v1.0.2 // indirect
8584
github.com/pkg/errors v0.9.1 // indirect
8685
github.com/pmezard/go-difflib v1.0.0 // indirect
87-
github.com/prometheus/client_golang v1.7.1 // indirect
86+
github.com/prometheus/client_golang v1.11.0 // indirect
8887
github.com/prometheus/client_model v0.2.0 // indirect
89-
github.com/prometheus/common v0.10.0 // indirect
90-
github.com/prometheus/procfs v0.2.0 // indirect
88+
github.com/prometheus/common v0.26.0 // indirect
89+
github.com/prometheus/procfs v0.6.0 // indirect
9190
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
9291
github.com/spf13/cobra v1.1.1 // indirect
93-
go.uber.org/atomic v1.6.0 // indirect
94-
go.uber.org/multierr v1.5.0 // indirect
92+
go.uber.org/atomic v1.7.0 // indirect
93+
go.uber.org/multierr v1.6.0 // indirect
9594
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b // indirect
9695
golang.org/x/mod v0.4.0 // indirect
97-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
96+
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
9897
golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd // indirect
99-
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
100-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
101-
golang.org/x/text v0.3.4 // indirect
102-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
103-
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e // indirect
98+
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
99+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
100+
golang.org/x/text v0.3.6 // indirect
101+
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
102+
golang.org/x/tools v0.1.0 // indirect
104103
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
105-
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
104+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
106105
google.golang.org/appengine v1.6.7 // indirect
107106
google.golang.org/protobuf v1.26.0 // indirect
108107
gopkg.in/inf.v0 v0.9.1 // indirect
109-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
110-
k8s.io/apiextensions-apiserver v0.20.2 // indirect
111-
k8s.io/component-base v0.20.2 // indirect
112-
k8s.io/gengo v0.0.0-20201113003025-83324d819ded // indirect
113-
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
114-
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
108+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
109+
k8s.io/apiextensions-apiserver v0.21.2 // indirect
110+
k8s.io/component-base v0.21.2 // indirect
111+
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
112+
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
113+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
115114
)
116115

117116
// indirect dependencies that need to be updated
118117

119-
replace k8s.io/client-go v9.0.0+incompatible => k8s.io/client-go v0.20.2
118+
replace k8s.io/client-go v9.0.0+incompatible => k8s.io/client-go v0.21.2
120119

121120
replace github.com/gin-gonic/gin v1.4.0 => github.com/gin-gonic/gin v1.7.0
122121

0 commit comments

Comments
 (0)