Skip to content

Commit

Permalink
changed default kafka version
Browse files Browse the repository at this point in the history
  • Loading branch information
yuzhichang committed Sep 7, 2021
1 parent b3632d8 commit 0c75840
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.16.7
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (cfg *Config) Normallize() (err error) {
return
}
if cfg.Kafka.Version == "" {
cfg.Kafka.Version = "2.6.0"
cfg.Kafka.Version = "2.5.0"
}

cfg.convertKfkSecurity()
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
security_opt:
- label:disable
kafka:
image: confluentinc/cp-kafka:6.1.1
image: confluentinc/cp-kafka:5.5.0
container_name: kafka
restart: always
hostname: kafka
Expand Down
2 changes: 1 addition & 1 deletion docker/test_auto_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"kafka": {
"brokers": "127.0.0.1:9093",
"version": "2.6.0"
"version": "2.5.0"
},
"task": {
"name": "test_auto_schema",
Expand Down
2 changes: 1 addition & 1 deletion docker/test_fixed_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"kafka": {
"brokers": "127.0.0.1:9093",
"version": "2.6.0"
"version": "2.5.0"
},
"task": {
"name": "test_fixed_schema",
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
},

// kafka version, if you use sarama, the version must be specified
"version": "2.6.0"
"version": "2.5.0"
},

"task": {
Expand Down
14 changes: 7 additions & 7 deletions docs/dev/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ An example kafka config:
"kafka": {
"brokers": "192.168.31.64:9092",
"@version": "Required if you use sarama. It's the the Kafka server version.",
"version": "2.6.0"
"version": "2.5.0"
}
```

Expand All @@ -114,7 +114,7 @@ An example kafka config:
```json
"kafka": {
"brokers": "192.168.31.64:9093",
"version": "2.6.0",
"version": "2.5.0",
"tls": {
"enable": true,
"@trustStoreLocation": "ssl.truststore.location which kafka-console-consumer.sh uses",
Expand All @@ -132,7 +132,7 @@ Or if you have extracted certificates from JKS, use the following config:
```json
"kafka": {
"brokers": "192.168.31.64:9093",
"version": "2.6.0",
"version": "2.5.0",
"tls": {
"enable": true,
"@caCertFiles": "Required. It's the CA certificate with which Kafka brokers certs be signed. This cert is added to kafka.client.truststore.jks which kafka-console-consumer.sh uses",
Expand Down Expand Up @@ -169,7 +169,7 @@ An example kafka config:
"kafka": {
"brokers": "192.168.31.64:9092",
"@version": "Required if you use sarama. It's the the Kafka server version.",
"version": "2.6.0"
"version": "2.5.0"
}
```

Expand All @@ -180,7 +180,7 @@ An example kafka config:
```json
"kafka": {
"brokers": "192.168.31.64:9094",
"version": "2.6.0",
"version": "2.5.0",
"sasl": {
"enable": true,
"mechanism": "PLAIN",
Expand Down Expand Up @@ -211,7 +211,7 @@ An example kafka config:
```json
"kafka": {
"brokers": "192.168.31.64:9094",
"version": "2.6.0",
"version": "2.5.0",
"sasl": {
"enable": true,
"@mechanism": "SCRAM-SHA-256 or SCRAM-SHA-512",
Expand Down Expand Up @@ -243,7 +243,7 @@ An example kafka config:
```json
"kafka": {
"brokers": "192.168.31.64:9094",
"version": "2.6.0",
"version": "2.5.0",
"sasl": {
"enable": true,
"mechanism": "GSSAPI",
Expand Down

0 comments on commit 0c75840

Please sign in to comment.