Skip to content

Commit 2d7fc31

Browse files
committed
refactor: removed controller_auth listener
1 parent b58e523 commit 2d7fc31

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

rust/operator-binary/src/crd/listener.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ pub enum KafkaListenerName {
4444
Bootstrap,
4545
#[strum(serialize = "CONTROLLER")]
4646
Controller,
47-
#[strum(serialize = "CONTROLLER_AUTH")]
48-
ControllerAuth,
4947
}
5048

5149
impl KafkaListenerName {

rust/operator-binary/src/crd/security.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -678,17 +678,6 @@ impl KafkaTlsSecurity {
678678
pub fn controller_config_settings(&self) -> BTreeMap<String, String> {
679679
let mut config = BTreeMap::new();
680680

681-
// We set either client tls with authentication or client tls without authentication
682-
// If authentication is explicitly required we do not want to have any other CAs to
683-
// be trusted.
684-
if self.tls_client_authentication_class().is_some() {
685-
// client auth required
686-
config.insert(
687-
KafkaListenerName::ControllerAuth.listener_ssl_client_auth(),
688-
"required".to_string(),
689-
);
690-
}
691-
692681
if self.tls_client_authentication_class().is_some()
693682
|| self.tls_internal_secret_class().is_some()
694683
{
@@ -716,6 +705,16 @@ impl KafkaTlsSecurity {
716705
KafkaListenerName::Controller.listener_ssl_truststore_type(),
717706
"PKCS12".to_string(),
718707
);
708+
// We set either client tls with authentication or client tls without authentication
709+
// If authentication is explicitly required we do not want to have any other CAs to
710+
// be trusted.
711+
if self.tls_client_authentication_class().is_some() {
712+
// client auth required
713+
config.insert(
714+
KafkaListenerName::Controller.listener_ssl_client_auth(),
715+
"required".to_string(),
716+
);
717+
}
719718
}
720719

721720
// Kerberos

0 commit comments

Comments
 (0)