Skip to content

Commit 1115443

Browse files
amuraruamuraru
authored
Update dependencies (banzaicloud#680)
- Upgrade k8s libs to 0.22.2 - Upgrade envtest to 1.22.x - Upgrade controller-gen to 0.7.0 - Upgrade controller-runtime to 0.10.2
1 parent 7bd38fe commit 1115443

File tree

12 files changed

+1510
-565
lines changed

12 files changed

+1510
-565
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ TAG ?= $(shell git describe --tags --abbrev=0 --match 'v[0-9].*[0-9].*[0-9]' 2>/
66
IMG ?= ghcr.io/banzaicloud/kafka-operator:$(TAG)
77

88
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
9-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
9+
CRD_OPTIONS ?= "crd"
1010

1111
RELEASE_TYPE ?= p
1212
RELEASE_MSG ?= "operator release"
1313

1414
REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG})
1515

16-
GOLANGCI_VERSION = 1.41.1
16+
GOLANGCI_VERSION = 1.42.1
1717
LICENSEI_VERSION = 0.2.0
1818
GOPROXY=https://proxy.golang.org
1919

20-
CONTROLLER_GEN_VERSION = v0.6.1
20+
CONTROLLER_GEN_VERSION = v0.7.0
2121
CONTROLLER_GEN = $(PWD)/bin/controller-gen
2222

23-
ENVTEST_K8S_VERSION = 1.21.x
23+
ENVTEST_K8S_VERSION = 1.22.x
2424

2525
KUSTOMIZE_BASE = config/overlays/specific-manager-version
2626

‎api/go.mod

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ go 1.16
44

55
require (
66
emperror.dev/errors v0.8.0
7-
github.com/banzaicloud/istio-client-go v0.0.10
7+
github.com/banzaicloud/istio-client-go v0.0.11
88
github.com/google/go-cmp v0.5.6 // indirect
99
github.com/imdario/mergo v0.3.12
10-
github.com/jetstack/cert-manager v1.4.1
11-
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
10+
github.com/jetstack/cert-manager v1.4.4
11+
github.com/json-iterator/go v1.1.12 // indirect
12+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
13+
golang.org/x/text v0.3.7 // indirect
1214
gotest.tools v2.2.0+incompatible
13-
k8s.io/api v0.21.3
14-
k8s.io/apimachinery v0.21.3
15-
sigs.k8s.io/controller-runtime v0.9.3
15+
k8s.io/api v0.22.2
16+
k8s.io/apimachinery v0.22.2
17+
sigs.k8s.io/controller-runtime v0.10.2
1618
)

‎api/go.sum

+115-46
Large diffs are not rendered by default.

‎charts/kafka-operator/templates/crds.yaml

+639-208
Large diffs are not rendered by default.

‎config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml

+637-206
Large diffs are not rendered by default.

‎config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: kafkatopics.kafka.banzaicloud.io
1010
spec:

‎config/base/crds/kafka.banzaicloud.io_kafkausers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: kafkausers.kafka.banzaicloud.io
1010
spec:

‎controllers/tests/suite_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import (
4141
ginkoconfig "github.com/onsi/ginkgo/config"
4242

4343
apiv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
44-
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
4544
"k8s.io/apimachinery/pkg/runtime"
4645
"k8s.io/apimachinery/pkg/types"
4746
k8sscheme "k8s.io/client-go/kubernetes/scheme"
@@ -109,7 +108,6 @@ var _ = BeforeSuite(func() {
109108
scheme := runtime.NewScheme()
110109

111110
Expect(k8sscheme.AddToScheme(scheme)).To(Succeed())
112-
Expect(apiextensionsv1beta1.AddToScheme(scheme)).To(Succeed())
113111
Expect(apiv1.AddToScheme(scheme)).To(Succeed())
114112
Expect(cmv1.AddToScheme(scheme)).To(Succeed())
115113
Expect(banzaicloudv1alpha1.AddToScheme(scheme)).To(Succeed())
@@ -193,7 +191,7 @@ var _ = BeforeSuite(func() {
193191
Expect(err).ToNot(HaveOccurred())
194192
Expect(k8sClient).ToNot(BeNil())
195193

196-
crd := &apiextensionsv1beta1.CustomResourceDefinition{}
194+
crd := &apiv1.CustomResourceDefinition{}
197195

198196
err = k8sClient.Get(context.TODO(), types.NamespacedName{Name: "kafkaclusters.kafka.banzaicloud.io"}, crd)
199197
Expect(err).NotTo(HaveOccurred())

‎go.mod

+14-18
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,39 @@ go 1.16
55
require (
66
emperror.dev/errors v0.8.0
77
github.com/Shopify/sarama v1.29.1
8-
github.com/banzaicloud/istio-client-go v0.0.10
8+
github.com/banzaicloud/istio-client-go v0.0.11
99
github.com/banzaicloud/istio-operator/pkg/apis v0.10.5
1010
github.com/banzaicloud/k8s-objectmatcher v1.5.2
1111
github.com/banzaicloud/koperator/api v0.0.0
1212
github.com/banzaicloud/koperator/properties v0.1.0
1313
github.com/cespare/xxhash/v2 v2.1.2 // indirect
14-
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158 // indirect
14+
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
1515
github.com/envoyproxy/go-control-plane v0.9.9
1616
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1717
github.com/go-logr/logr v0.4.0
18-
github.com/google/uuid v1.1.5 // indirect
18+
github.com/google/uuid v1.3.0 // indirect
1919
github.com/imdario/mergo v0.3.12
2020
github.com/jetstack/cert-manager v1.5.3
21-
github.com/klauspost/compress v1.13.5 // indirect
2221
github.com/lestrrat-go/backoff v1.0.1
2322
github.com/mattn/go-isatty v0.0.13 // indirect
24-
github.com/onsi/ginkgo v1.16.4
23+
github.com/onsi/ginkgo v1.16.5
2524
github.com/onsi/gomega v1.16.0
2625
github.com/pavel-v-chernykh/keystore-go/v4 v4.1.0
2726
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
28-
github.com/prometheus/common v0.30.0
27+
github.com/prometheus/common v0.31.1
2928
go.uber.org/zap v1.19.0
30-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
31-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
32-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
33-
golang.org/x/sys v0.0.0-20210902050250-f475640dd07b // indirect
34-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
35-
golang.org/x/text v0.3.7 // indirect
29+
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
30+
golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 // indirect
31+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
3632
google.golang.org/protobuf v1.27.1
3733
gotest.tools v2.2.0+incompatible
38-
k8s.io/api v0.22.1
39-
k8s.io/apiextensions-apiserver v0.22.1
40-
k8s.io/apimachinery v0.22.1
41-
k8s.io/client-go v0.22.1
42-
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 // indirect
34+
k8s.io/api v0.22.2
35+
k8s.io/apiextensions-apiserver v0.22.2
36+
k8s.io/apimachinery v0.22.2
37+
k8s.io/client-go v0.22.2
38+
k8s.io/kube-openapi v0.0.0-20211014175136-b3fe75cc9b2f // indirect
4339
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
44-
sigs.k8s.io/controller-runtime v0.9.6
40+
sigs.k8s.io/controller-runtime v0.10.2
4541
)
4642

4743
replace (

0 commit comments

Comments
 (0)