Skip to content

Commit d1a2269

Browse files
committed
Ensure externallisteners are listed first
1 parent 1b56507 commit d1a2269

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pkg/resources/kafka/configmap.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,17 @@ func getListenerSpecificConfig(l *v1beta1.ListenersConfig, serverPasses map[stri
417417
internalListenerSSLConfig = make(map[string]string)
418418
externalListenerSSLConfig = make(map[string]string)
419419

420+
for _, eListener := range l.ExternalListeners {
421+
upperedListenerType := eListener.Type.ToUpperString()
422+
upperedListenerName := strings.ToUpper(eListener.Name)
423+
securityProtocolMapConfig = append(securityProtocolMapConfig, fmt.Sprintf("%s:%s", upperedListenerName, upperedListenerType))
424+
listenerConfig = append(listenerConfig, fmt.Sprintf("%s://:%d", upperedListenerName, eListener.ContainerPort))
425+
// Add external listeners SSL configuration
426+
if eListener.Type == v1beta1.SecurityProtocolSSL {
427+
maps.Copy(externalListenerSSLConfig, generateListenerSSLConfig(eListener.Name, eListener.SSLClientAuth, serverPasses[eListener.Name]))
428+
}
429+
}
430+
420431
for _, iListener := range l.InternalListeners {
421432
if iListener.UsedForInnerBrokerCommunication {
422433
if interBrokerListenerName == "" {
@@ -436,17 +447,6 @@ func getListenerSpecificConfig(l *v1beta1.ListenersConfig, serverPasses map[stri
436447
}
437448
}
438449

439-
for _, eListener := range l.ExternalListeners {
440-
upperedListenerType := eListener.Type.ToUpperString()
441-
upperedListenerName := strings.ToUpper(eListener.Name)
442-
securityProtocolMapConfig = append(securityProtocolMapConfig, fmt.Sprintf("%s:%s", upperedListenerName, upperedListenerType))
443-
listenerConfig = append(listenerConfig, fmt.Sprintf("%s://:%d", upperedListenerName, eListener.ContainerPort))
444-
// Add external listeners SSL configuration
445-
if eListener.Type == v1beta1.SecurityProtocolSSL {
446-
maps.Copy(externalListenerSSLConfig, generateListenerSSLConfig(eListener.Name, eListener.SSLClientAuth, serverPasses[eListener.Name]))
447-
}
448-
}
449-
450450
return interBrokerListenerName, securityProtocolMapConfig, listenerConfig, internalListenerSSLConfig, externalListenerSSLConfig
451451
}
452452

0 commit comments

Comments
 (0)