Skip to content

Commit ca2b1a4

Browse files
Amol VermaAmol Verma
Amol Verma
authored and
Amol Verma
committed
[storage] Fix Kafka TLS configuration with plaintext authentication
This change fixes the Kafka TLS configuration to work correctly when using plaintext authentication with TLS enabled. Previously, TLS would only be configured when authentication=tls, breaking SASL-SSL with PLAIN authentication. Changes: - Modified TLS configuration logic to support TLS with other authentication methods - Fixed SASL-SSL with PLAIN authentication scenario - Maintained backward compatibility with existing authentication methods - Restored pre-PR-6270 behavior for TLS configuration Resolves jaegertracing#6744 Signed-off-by: Amol Verma <[email protected]>
1 parent 8b29373 commit ca2b1a4

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

pkg/kafka/auth/tls.go

-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,5 @@ func setTLSConfiguration(config *configtls.ClientConfig, saramaConfig *sarama.Co
2020

2121
saramaConfig.Net.TLS.Enable = true
2222
saramaConfig.Net.TLS.Config = tlsConfig
23-
logger.Info("TLS configuration enabled for Kafka client",
24-
zap.Bool("skip_verify", config.InsecureSkipVerify),
25-
zap.String("ca_file", config.CAFile),
26-
zap.Bool("system_ca_enabled", config.Config.IncludeSystemCACertsPool))
2723
return nil
2824
}

0 commit comments

Comments
 (0)