Skip to content

Commit 092de09

Browse files
eduardagaricieduardagarici
authored
Merge branch 'master' into CORE-129189
2 parents ed02f71 + e537b1c commit 092de09

File tree

19 files changed

+191
-234
lines changed

19 files changed

+191
-234
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
dario.cat/mergo v1.0.2
77
emperror.dev/errors v0.8.1
88
github.com/banzaicloud/istio-client-go v0.0.17
9-
github.com/cert-manager/cert-manager v1.19.0
9+
github.com/cert-manager/cert-manager v1.19.1
1010
k8s.io/api v0.34.1
1111
k8s.io/apimachinery v0.34.1
12-
sigs.k8s.io/controller-runtime v0.22.2
12+
sigs.k8s.io/controller-runtime v0.22.3
1313
)
1414

1515
require (

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0=
44
emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE=
55
github.com/banzaicloud/istio-client-go v0.0.17 h1:wiplbM7FDiIHopujInAnin3zuovtVcphtKy9En39q5I=
66
github.com/banzaicloud/istio-client-go v0.0.17/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I=
7-
github.com/cert-manager/cert-manager v1.19.0 h1:pPKtK06zPriliwq7B12xa7DGKbc4SvnfOjE0BXaAspk=
8-
github.com/cert-manager/cert-manager v1.19.0/go.mod h1:7VBp/ihp5Xgz/ZJuGy1fNIWbDouQKBonvEyWoJLuhmA=
7+
github.com/cert-manager/cert-manager v1.19.1 h1:Txh8L/nLWTDcb7ZnXuXbTe15BxQnLbLirXmbNk0fGgY=
8+
github.com/cert-manager/cert-manager v1.19.1/go.mod h1:8Ps1VXCQRGKT8zNvLQlhDK1gFKWmYKdIPQFmvTS2JeA=
99
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1010
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1111
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -131,8 +131,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
131131
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
132132
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
133133
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
134-
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
135-
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
134+
sigs.k8s.io/controller-runtime v0.22.3 h1:I7mfqz/a/WdmDCEnXmSPm8/b/yRTy6JsKKENTijTq8Y=
135+
sigs.k8s.io/controller-runtime v0.22.3/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
136136
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
137137
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
138138
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23639,12 +23639,14 @@ spec:
2363923639
Deprecated: Use IssuerReference instead.
2364023640
properties:
2364123641
group:
23642-
default: cert-manager.io
23643-
description: Group of the issuer being referred to.
23642+
description: |-
23643+
Group of the issuer being referred to.
23644+
Defaults to 'cert-manager.io'.
2364423645
type: string
2364523646
kind:
23646-
default: Issuer
23647-
description: Kind of the issuer being referred to.
23647+
description: |-
23648+
Kind of the issuer being referred to.
23649+
Defaults to 'Issuer'.
2364823650
type: string
2364923651
name:
2365023652
description: Name of the issuer being referred to.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ spec:
8181
Deprecated: Use IssuerReference instead.
8282
properties:
8383
group:
84-
default: cert-manager.io
85-
description: Group of the issuer being referred to.
84+
description: |-
85+
Group of the issuer being referred to.
86+
Defaults to 'cert-manager.io'.
8687
type: string
8788
kind:
88-
default: Issuer
89-
description: Kind of the issuer being referred to.
89+
description: |-
90+
Kind of the issuer being referred to.
91+
Defaults to 'Issuer'.
9092
type: string
9193
name:
9294
description: Name of the issuer being referred to.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23639,12 +23639,14 @@ spec:
2363923639
Deprecated: Use IssuerReference instead.
2364023640
properties:
2364123641
group:
23642-
default: cert-manager.io
23643-
description: Group of the issuer being referred to.
23642+
description: |-
23643+
Group of the issuer being referred to.
23644+
Defaults to 'cert-manager.io'.
2364423645
type: string
2364523646
kind:
23646-
default: Issuer
23647-
description: Kind of the issuer being referred to.
23647+
description: |-
23648+
Kind of the issuer being referred to.
23649+
Defaults to 'Issuer'.
2364823650
type: string
2364923651
name:
2365023652
description: Name of the issuer being referred to.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ spec:
8181
Deprecated: Use IssuerReference instead.
8282
properties:
8383
group:
84-
default: cert-manager.io
85-
description: Group of the issuer being referred to.
84+
description: |-
85+
Group of the issuer being referred to.
86+
Defaults to 'cert-manager.io'.
8687
type: string
8788
kind:
88-
default: Issuer
89-
description: Kind of the issuer being referred to.
89+
description: |-
90+
Kind of the issuer being referred to.
91+
Defaults to 'Issuer'.
9092
type: string
9193
name:
9294
description: Name of the issuer being referred to.

‎controllers/tests/clusterregistry/cruisecontroltask_controller_test.go‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,9 @@ var _ = Describe("CruiseControllerTaskController", func() {
6868
kafkaCluster.Annotations[clusterregv1alpha1.OwnershipAnnotation] = "id"
6969
err := k8sClient.Create(ctx, kafkaCluster)
7070
Expect(err).ToNot(HaveOccurred())
71-
Eventually(func() int {
72-
reconciles := kafkaClusterReconciler.NumOfRequests()
73-
log.Info("check reconciles on create", "reconciles", reconciles)
74-
return reconciles
75-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
71+
Consistently(func() int {
72+
return kafkaClusterReconciler.NumOfRequests()
73+
}, 5, 1).Should(BeNumerically("==", expectedNumOfReconciles))
7674

7775
By("updating the KafkaCluster CR Status")
7876
kafkaCluster.Status.BrokersState = map[string]v1beta1.BrokerState{
@@ -94,20 +92,16 @@ var _ = Describe("CruiseControllerTaskController", func() {
9492
}
9593
err = k8sClient.Status().Update(ctx, kafkaCluster)
9694
Expect(err).ToNot(HaveOccurred())
97-
Eventually(func() int {
98-
reconciles := kafkaClusterReconciler.NumOfRequests()
99-
log.Info("check reconciles on update", "reconciles", reconciles)
100-
return reconciles
101-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
95+
Consistently(func() int {
96+
return kafkaClusterReconciler.NumOfRequests()
97+
}, 5, 1).Should(BeNumerically("==", expectedNumOfReconciles))
10298

10399
By("deleting the KafkaCluster CR")
104100
err = k8sClient.Delete(ctx, kafkaCluster)
105101
Expect(err).ToNot(HaveOccurred())
106-
Eventually(func() int {
107-
reconciles := kafkaClusterReconciler.NumOfRequests()
108-
log.Info("check reconciles on delete", "reconciles", reconciles)
109-
return reconciles
110-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
102+
Consistently(func() int {
103+
return kafkaClusterReconciler.NumOfRequests()
104+
}, 5, 1).Should(BeNumerically("==", expectedNumOfReconciles))
111105
})
112106
})
113107

@@ -118,10 +112,8 @@ var _ = Describe("CruiseControllerTaskController", func() {
118112
err := k8sClient.Create(ctx, kafkaCluster)
119113
Expect(err).ToNot(HaveOccurred())
120114
Eventually(func() int {
121-
reconciles := kafkaClusterReconciler.NumOfRequests()
122-
log.Info("check reconciles on create", "reconciles", reconciles)
123-
return reconciles
124-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
115+
return kafkaClusterReconciler.NumOfRequests()
116+
}, 10, 1).Should(BeNumerically("==", expectedNumOfReconciles))
125117

126118
By("updating the KafkaCluster CR Status")
127119
expectedNumOfReconciles += 1
@@ -145,20 +137,16 @@ var _ = Describe("CruiseControllerTaskController", func() {
145137
err = k8sClient.Status().Update(ctx, kafkaCluster)
146138
Expect(err).ToNot(HaveOccurred())
147139
Eventually(func() int {
148-
reconciles := kafkaClusterReconciler.NumOfRequests()
149-
log.Info("check reconciles on update", "reconciles", reconciles)
150-
return reconciles
151-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
140+
return kafkaClusterReconciler.NumOfRequests()
141+
}, 10, 1).Should(BeNumerically("==", expectedNumOfReconciles))
152142

153143
By("deleting the KafkaCluster CR")
154144
expectedNumOfReconciles += 1
155145
err = k8sClient.Delete(ctx, kafkaCluster)
156146
Expect(err).ToNot(HaveOccurred())
157147
Eventually(func() int {
158-
reconciles := kafkaClusterReconciler.NumOfRequests()
159-
log.Info("check reconciles on delete", "reconciles", reconciles)
160-
return reconciles
161-
}, 10).Should(BeNumerically("==", expectedNumOfReconciles))
148+
return kafkaClusterReconciler.NumOfRequests()
149+
}, 10, 1).Should(BeNumerically("==", expectedNumOfReconciles))
162150
})
163151
})
164152
})

‎controllers/tests/clusterregistry/log.txt‎

Whitespace-only changes.

‎go.mod‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,40 @@ go 1.25.0
55
require (
66
dario.cat/mergo v1.0.2
77
emperror.dev/errors v0.8.1
8-
github.com/IBM/sarama v1.46.1
8+
github.com/IBM/sarama v1.46.3
99
github.com/Masterminds/sprig/v3 v3.3.0
1010
github.com/banzaicloud/go-cruise-control v0.6.0
1111
github.com/banzaicloud/istio-client-go v0.0.17
1212
github.com/banzaicloud/istio-operator/api/v2 v2.17.4
1313
github.com/banzaicloud/k8s-objectmatcher v1.8.0
1414
github.com/banzaicloud/koperator/api v0.28.8
1515
github.com/banzaicloud/koperator/properties v0.4.1
16-
github.com/cert-manager/cert-manager v1.19.0
16+
github.com/cert-manager/cert-manager v1.19.1
1717
github.com/cisco-open/cluster-registry-controller/api v0.2.12
1818
github.com/envoyproxy/go-control-plane v0.13.4
1919
github.com/envoyproxy/go-control-plane/envoy v1.35.0
2020
github.com/go-logr/logr v1.4.3
21-
github.com/onsi/ginkgo/v2 v2.26.0
21+
github.com/onsi/ginkgo/v2 v2.27.2
2222
github.com/onsi/gomega v1.38.2
2323
github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0
2424
github.com/projectcontour/contour v1.33.0
25-
github.com/prometheus/common v0.67.1
25+
github.com/prometheus/common v0.67.2
2626
github.com/stretchr/testify v1.11.1
2727
go.uber.org/mock v0.6.0
2828
go.uber.org/zap v1.27.0
29-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b
29+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
3030
google.golang.org/protobuf v1.36.10
3131
gopkg.in/inf.v0 v0.9.1
3232
gotest.tools v2.2.0+incompatible
3333
k8s.io/api v0.34.1
3434
k8s.io/apiextensions-apiserver v0.34.1
3535
k8s.io/apimachinery v0.34.1
3636
k8s.io/client-go v0.34.1
37-
sigs.k8s.io/controller-runtime v0.22.2
37+
sigs.k8s.io/controller-runtime v0.22.3
3838
)
3939

4040
require (
41-
cel.dev/expr v0.24.0 // indirect
41+
cel.dev/expr v0.25.0 // indirect
4242
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
4343
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4444
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
@@ -59,14 +59,13 @@ require (
5959
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
6060
github.com/stretchr/objx v0.5.2 // indirect
6161
github.com/x448/float16 v0.8.4 // indirect
62-
go.uber.org/automaxprocs v1.6.0 // indirect
6362
go.yaml.in/yaml/v2 v2.4.3 // indirect
6463
go.yaml.in/yaml/v3 v3.0.4 // indirect
6564
golang.org/x/mod v0.29.0 // indirect
6665
golang.org/x/sync v0.17.0 // indirect
6766
golang.org/x/tools v0.38.0 // indirect
68-
google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
7069
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7170
sigs.k8s.io/randfill v1.0.0 // indirect
7271
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
@@ -79,7 +78,7 @@ require (
7978
github.com/beorn7/perks v1.0.1 // indirect
8079
github.com/briandowns/spinner v1.23.2 // indirect
8180
github.com/cespare/xxhash/v2 v2.3.0 // indirect
82-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
81+
github.com/cncf/xds/go v0.0.0-20251031190108-5cf4b1949528 // indirect
8382
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8483
github.com/eapache/go-resiliency v1.7.0 // indirect
8584
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
@@ -107,7 +106,7 @@ require (
107106
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
108107
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
109108
github.com/json-iterator/go v1.1.12 // indirect
110-
github.com/klauspost/compress v1.18.0 // indirect
109+
github.com/klauspost/compress v1.18.1 // indirect
111110
github.com/mattn/go-colorable v0.1.14 // indirect
112111
github.com/mattn/go-isatty v0.0.20 // indirect
113112
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -120,7 +119,7 @@ require (
120119
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
121120
github.com/prometheus/client_golang v1.23.2 // indirect
122121
github.com/prometheus/client_model v0.6.2 // indirect
123-
github.com/prometheus/procfs v0.17.0 // indirect
122+
github.com/prometheus/procfs v0.19.2 // indirect
124123
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
125124
github.com/shopspring/decimal v1.4.0 // indirect
126125
github.com/spf13/cast v1.10.0 // indirect
@@ -139,7 +138,7 @@ require (
139138
golang.org/x/time v0.14.0 // indirect
140139
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
141140
gopkg.in/yaml.v3 v3.0.1 // indirect
142-
istio.io/api v1.27.1 // indirect
141+
istio.io/api v1.27.3 // indirect
143142
k8s.io/klog/v2 v2.130.1 // indirect
144143
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
145144
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect

0 commit comments

Comments
 (0)