Skip to content

Commit

Permalink
Clean kafka default configuration
Browse files Browse the repository at this point in the history
Signed-off-by: yhmo <[email protected]>
  • Loading branch information
yhmo committed Feb 29, 2024
1 parent 2f76303 commit eef5247
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions configs/milvus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ pulsar:
# brokerList:
# saslUsername:
# saslPassword:
# saslMechanisms: PLAIN
# securityProtocol: SASL_SSL
# saslMechanisms:
# securityProtocol:
# readTimeout: 10 # read message timeout in seconds
# ssl:
# enabled: false # Whether to support kafka secure connection mode
Expand Down
14 changes: 7 additions & 7 deletions pkg/util/paramtable/service_param.go
Original file line number Diff line number Diff line change
Expand Up @@ -688,15 +688,15 @@ func (k *KafkaConfig) Init(base *BaseTable) {

k.SaslMechanisms = ParamItem{
Key: "kafka.saslMechanisms",
DefaultValue: "PLAIN",
DefaultValue: "",
Version: "2.1.0",
Export: true,
}
k.SaslMechanisms.Init(base.mgr)

k.SecurityProtocol = ParamItem{
Key: "kafka.securityProtocol",
DefaultValue: "SASL_SSL",
DefaultValue: "",
Version: "2.1.0",
Export: true,
}
Expand All @@ -705,39 +705,39 @@ func (k *KafkaConfig) Init(base *BaseTable) {
k.KafkaUseSSL = ParamItem{
Key: "kafka.ssl.enabled",
DefaultValue: "false",
Version: "2.3.8",
Version: "2.3.11",
Doc: "whether to enable ssl mode",
Export: true,
}
k.KafkaUseSSL.Init(base.mgr)

k.KafkaTLSCert = ParamItem{
Key: "kafka.ssl.tlsCert",
Version: "2.3.8",
Version: "2.3.11",
Doc: "path to client's public key (PEM) used for authentication",
Export: true,
}
k.KafkaTLSCert.Init(base.mgr)

k.KafkaTLSKey = ParamItem{
Key: "kafka.ssl.tlsKey",
Version: "2.3.8",
Version: "2.3.11",
Doc: "path to client's private key (PEM) used for authentication",
Export: true,
}
k.KafkaTLSKey.Init(base.mgr)

k.KafkaTLSCACert = ParamItem{
Key: "kafka.ssl.tlsCaCert",
Version: "2.3.8",
Version: "2.3.11",
Doc: "file or directory path to CA certificate(s) for verifying the broker's key",
Export: true,
}
k.KafkaTLSCACert.Init(base.mgr)

k.KafkaTLSKeyPassword = ParamItem{
Key: "kafka.ssl.tlsKeyPassword",
Version: "2.3.8",
Version: "2.3.11",
Doc: "private key passphrase for use with ssl.key.location and set_ssl_cert(), if any",
Export: true,
}
Expand Down

0 comments on commit eef5247

Please sign in to comment.