Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cc version #781

Merged
merged 2 commits into from
Mar 24, 2022
+9 −7
Merged

Update cc version #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe8279
Update the used default Cruise Control version to 2.5.86
Mar 24, 2022
0063ac5
Replaced deprecated 'kafka.security.auth.SimpleAclAuthorizer' with 'k…
Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1beta1/kafkacluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ func (cConfig *CruiseControlConfig) GetCCImage() string {
if cConfig.Image != "" {
return cConfig.Image
}
return "ghcr.io/banzaicloud/cruise-control:2.5.85"
return "ghcr.io/banzaicloud/cruise-control:2.5.86"
}

// GetCCLog4jConfig returns the used Cruise Control log4j configuration
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kafkacluster_with_ssl_groups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
cruise.control.metrics.topic.auto.create=true
cruise.control.metrics.topic.num.partitions=1
cruise.control.metrics.topic.replication.factor=2
authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer
authorizer.class.name=kafka.security.authorizer.AclAuthorizer
allow.everyone.if.no.acl.found=false
brokerConfigGroups:
default:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kafkacluster_with_ssl_groups_customcert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
cruise.control.metrics.topic.auto.create=true
cruise.control.metrics.topic.num.partitions=1
cruise.control.metrics.topic.replication.factor=2
authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer
authorizer.class.name=kafka.security.authorizer.AclAuthorizer
allow.everyone.if.no.acl.found=false
brokerConfigGroups:
default:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
cruise.control.metrics.topic.auto.create=true
cruise.control.metrics.topic.num.partitions=1
cruise.control.metrics.topic.replication.factor=2
authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer
authorizer.class.name=kafka.security.authorizer.AclAuthorizer
allow.everyone.if.no.acl.found=false
brokerConfigGroups:
default:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/simplekafkacluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
# limits:
# cpu: 500m
# memory: 1Gi
# image: "ghcr.io/banzaicloud/cruise-control:2.5.85"
# image: "ghcr.io/banzaicloud/cruise-control:2.5.86"
config: |
# Copyright 2017 LinkedIn Corp. Licensed under the BSD 2-Clause License (the "License"). See License in the project root for license information.
#
Expand Down
2 changes: 1 addition & 1 deletion controllers/tests/kafkacluster_controller_cruisecontrol_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func expectCruiseControlDeployment(kafkaCluster *v1beta1.KafkaCluster) {
Expect(container.Lifecycle).NotTo(BeNil())
Expect(container.Lifecycle.PreStop).NotTo(BeNil())
Expect(container.Lifecycle.PreStop.Exec).NotTo(BeNil())
Expect(container.Image).To(Equal("ghcr.io/banzaicloud/cruise-control:2.5.85"))
Expect(container.Image).To(Equal("ghcr.io/banzaicloud/cruise-control:2.5.86"))
Expect(container.Ports).To(ConsistOf(
corev1.ContainerPort{
ContainerPort: 8090,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
emperror.dev/errors v0.8.0
github.com/Shopify/sarama v1.30.0
github.com/banzaicloud/cluster-registry v0.0.7
github.com/banzaicloud/go-cruise-control v0.0.0-20220121135324-9178f00469c5
github.com/banzaicloud/go-cruise-control v0.0.0-20220324110942-71a3405be337
github.com/banzaicloud/istio-client-go v0.0.15
github.com/banzaicloud/istio-operator/api/v2 v2.11.8
github.com/banzaicloud/k8s-objectmatcher v1.7.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ github.com/banzaicloud/cluster-registry v0.0.7 h1:R7hE9YBybCWKOJSzrNPDIO+l8P03kG
github.com/banzaicloud/cluster-registry v0.0.7/go.mod h1:2tcT4bq6UaWOOeIBsjcrqawOfrybamYUJSM4jRVHQic=
github.com/banzaicloud/go-cruise-control v0.0.0-20220121135324-9178f00469c5 h1:6QjGAJrjVBf+7pjnnY6XE+D1DeMZmliv6DdpHeJW+EU=
github.com/banzaicloud/go-cruise-control v0.0.0-20220121135324-9178f00469c5/go.mod h1:ZOrxSqMkpjRnA6eyjaSfpnkPLuCy1JKBGIi6h9hyiuM=
github.com/banzaicloud/go-cruise-control v0.0.0-20220324110942-71a3405be337 h1:HnA0QC34j8Vd6uwP4priC2eO+0FQT0c41qnBE3DsfWw=
github.com/banzaicloud/go-cruise-control v0.0.0-20220324110942-71a3405be337/go.mod h1:ZOrxSqMkpjRnA6eyjaSfpnkPLuCy1JKBGIi6h9hyiuM=
github.com/banzaicloud/istio-client-go v0.0.11/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I=
github.com/banzaicloud/istio-client-go v0.0.15 h1:F2rr1tI/+19kDddLawft8scT8mGLNgBq23gV+I0zsh4=
github.com/banzaicloud/istio-client-go v0.0.15/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I=
Expand Down