Skip to content

Commit

Permalink
[storage] Fix Kafka TLS configuration with plaintext authentication
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Amol Verma authored and Amol Verma committed Feb 21, 2025
1 parent 8b29373 commit ca2b1a4
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions pkg/kafka/auth/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,5 @@ func setTLSConfiguration(config *configtls.ClientConfig, saramaConfig *sarama.Co

saramaConfig.Net.TLS.Enable = true
saramaConfig.Net.TLS.Config = tlsConfig
logger.Info("TLS configuration enabled for Kafka client",
zap.Bool("skip_verify", config.InsecureSkipVerify),
zap.String("ca_file", config.CAFile),
zap.Bool("system_ca_enabled", config.Config.IncludeSystemCACertsPool))
return nil
}

0 comments on commit ca2b1a4

Please sign in to comment.