Skip to content

Commit f835f21

Browse files
hvanhvan
committed
remove metric report configs for controllers
1 parent fd5bd7c commit f835f21

File tree

3 files changed

+8
-27
lines changed

3 files changed

+8
-27
lines changed

‎controllers/tests/kafkacluster_controller_kafka_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,17 +262,13 @@ process.roles=broker
262262
fmt.Println("Controller-only mode line 187")
263263
expectedBrokerConfig = fmt.Sprintf(`controller.listener.names=CONTROLLER
264264
controller.quorum.voters=1@%s-1.%s.svc.cluster.local:29093,2@%s-2.%s.svc.cluster.local:29093
265-
cruise.control.metrics.reporter.bootstrap.servers=%s-all-broker.%s.svc.cluster.local:29092
266-
cruise.control.metrics.reporter.kubernetes.mode=true
267265
inter.broker.listener.name=INTERNAL
268266
listener.security.protocol.map=TEST:PLAINTEXT,INTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT
269267
listeners=CONTROLLER://:29093
270268
log.dirs=/kafka-logs/kafka,/ephemeral-dir1/kafka
271-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
272269
node.id=%d
273270
process.roles=controller
274-
`, kafkaCluster.Name, kafkaCluster.Namespace, kafkaCluster.Name, kafkaCluster.Namespace, kafkaCluster.Name,
275-
kafkaCluster.Namespace, broker.Id)
271+
`, kafkaCluster.Name, kafkaCluster.Namespace, kafkaCluster.Name, kafkaCluster.Namespace, broker.Id)
276272
case 2:
277273
// combined node
278274
//debug

‎pkg/resources/kafka/configmap.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (r *Reconciler) getConfigProperties(bConfig *v1beta1.BrokerConfig, broker v
6363
config.Merge(generalConfig)
6464

6565
// Cruise Control metrics reporter configuration
66-
r.configCCMetricsReporter(broker, config, clientPass, log)
66+
r.configCCMetricsReporter(broker, bConfig, config, clientPass, log)
6767

6868
brokerReadOnlyConfig := getBrokerReadOnlyConfig(broker, r.KafkaCluster, log)
6969

@@ -112,7 +112,12 @@ func (r *Reconciler) getConfigProperties(bConfig *v1beta1.BrokerConfig, broker v
112112
return config
113113
}
114114

115-
func (r *Reconciler) configCCMetricsReporter(broker v1beta1.Broker, config *properties.Properties, clientPass string, log logr.Logger) {
115+
func (r *Reconciler) configCCMetricsReporter(broker v1beta1.Broker, bConfig *v1beta1.BrokerConfig, config *properties.Properties, clientPass string, log logr.Logger) {
116+
// Cruise Control Metrics Reporter configuration is only needed for brokers
117+
if bConfig.IsControllerOnlyNode() {
118+
return
119+
}
120+
116121
// Add Cruise Control Metrics Reporter SSL configuration
117122
if util.IsSSLEnabledForInternalCommunication(r.KafkaCluster.Spec.ListenersConfig.InternalListeners) {
118123
if !r.KafkaCluster.Spec.IsClientSSLSecretPresent() {

‎pkg/resources/kafka/configmap_test.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -842,13 +842,10 @@ process.roles=broker
842842
`,
843843
`controller.listener.names=CONTROLLER
844844
[email protected]:9093
845-
cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
846-
cruise.control.metrics.reporter.kubernetes.mode=true
847845
inter.broker.listener.name=INTERNAL
848846
listener.security.protocol.map=INTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT
849847
listeners=CONTROLLER://:9093
850848
log.dirs=/test-kafka-logs/kafka
851-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
852849
node.id=500
853850
process.roles=controller
854851
`,
@@ -980,13 +977,10 @@ process.roles=broker
980977
`,
981978
`controller.listener.names=CONTROLLER
982979
[email protected]:9093,[email protected]:9093
983-
cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
984-
cruise.control.metrics.reporter.kubernetes.mode=true
985980
inter.broker.listener.name=INTERNAL
986981
listener.security.protocol.map=INTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT
987982
listeners=CONTROLLER://:9093
988983
log.dirs=/test-kafka-logs/kafka,/test-kafka-logs-50/kafka
989-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
990984
node.id=50
991985
process.roles=controller
992986
`,
@@ -1162,13 +1156,10 @@ process.roles=broker
11621156
`,
11631157
`controller.listener.names=CONTROLLER
11641158
[email protected]:9093,[email protected]:9093
1165-
cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
1166-
cruise.control.metrics.reporter.kubernetes.mode=true
11671159
inter.broker.listener.name=INTERNAL
11681160
listener.security.protocol.map=INTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT
11691161
listeners=CONTROLLER://:9093
11701162
log.dirs=/test-kafka-logs/kafka,/test-kafka-logs-50/kafka
1171-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
11721163
node.id=50
11731164
process.roles=controller
11741165
`,
@@ -1377,13 +1368,6 @@ process.roles=broker
13771368
`,
13781369
`controller.listener.names=CONTROLLER
13791370
[email protected]:9093
1380-
cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
1381-
cruise.control.metrics.reporter.kubernetes.mode=true
1382-
cruise.control.metrics.reporter.security.protocol=SSL
1383-
cruise.control.metrics.reporter.ssl.keystore.location=/var/run/secrets/java.io/keystores/client/keystore.jks
1384-
cruise.control.metrics.reporter.ssl.keystore.password=
1385-
cruise.control.metrics.reporter.ssl.truststore.location=/var/run/secrets/java.io/keystores/client/truststore.jks
1386-
cruise.control.metrics.reporter.ssl.truststore.password=
13871371
inter.broker.listener.name=INTERNAL
13881372
listener.name.controller.ssl.client.auth=none
13891373
listener.name.controller.ssl.keystore.location=/var/run/secrets/java.io/keystores/server/controller/keystore.jks
@@ -1402,7 +1386,6 @@ listener.name.internal.ssl.truststore.type=JKS
14021386
listener.security.protocol.map=INTERNAL:SSL,CONTROLLER:SSL
14031387
listeners=CONTROLLER://:9093
14041388
log.dirs=/test-kafka-logs/kafka
1405-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
14061389
node.id=500
14071390
process.roles=controller
14081391
`},
@@ -1515,8 +1498,6 @@ node.id=0
15151498
process.roles=broker
15161499
`,
15171500
`[email protected]:9093
1518-
cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
1519-
cruise.control.metrics.reporter.kubernetes.mode=true
15201501
inter.broker.listener.name=
15211502
listener.name.controller.ssl.client.auth=none
15221503
listener.name.controller.ssl.keystore.location=/var/run/secrets/java.io/keystores/server/controller/keystore.jks
@@ -1535,7 +1516,6 @@ listener.name.external.ssl.truststore.type=JKS
15351516
listener.security.protocol.map=EXTERNAL:SSL,CONTROLLER:SSL
15361517
listeners=EXTERNAL://:9092
15371518
log.dirs=/test-kafka-logs/kafka
1538-
metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter
15391519
node.id=500
15401520
process.roles=controller
15411521
`},

0 commit comments

Comments
 (0)