[CORE-135195] - Update InterBrokerListener Logic (#111)

* [CORE-135195] - Update InterBrokerListener Logic

---------

Co-authored-by: Daniel Vaseekaran <[email protected]>

Author: dvaseekara

pkg/resources/kafka/configmap.go

@@ -440,7 +440,9 @@ func generateListenerSpecificConfig(kcs *v1beta1.KafkaClusterSpec, serverPasses
 		brokerID := broker.Id
 
 		b := broker.ReadOnlyConfig
-		trimmedConfig := strings.TrimSpace(b)
+		krb := kcs.ReadOnlyConfig
+
+		trimmedConfig := strings.TrimSpace(b) + strings.TrimSpace(krb)
 
 		if !strings.Contains(trimmedConfig, kafkautils.KafkaConfigSecurityInterBrokerProtocol+"=") {
 			if err := brokerConfig.Set(kafkautils.KafkaConfigInterBrokerListenerName, interBrokerListenerName); err != nil {

pkg/resources/kafka/configmap_test.go

@@ -619,7 +619,6 @@ zookeeper.connect=example.zk:2181/`,
 broker.id=0
 cruise.control.metrics.reporter.bootstrap.servers=kafka-all-broker.kafka.svc.cluster.local:9092
 cruise.control.metrics.reporter.kubernetes.mode=true
-inter.broker.listener.name=INTERNAL
 listener.security.protocol.map=INTERNAL:PLAINTEXT
 listeners=INTERNAL://:9092
 security.inter.broker.protocol=SASL_SSL