Merge 187a87f749d5eb5258221dc95e2d3b8347a653f7 into 545125884e8b1dbfe4de71a34ad1a5a5663bef7c

config/discovery.yml

@@ -4,8 +4,8 @@ etcd:
   address: [localhost:12379]
   ## Attention: If you set auth in etcd
   ## you must also update the username and password in Chat project.
-  username:
-  password:
+  # username: "openIM"
+  # password: "openIM123"
 
 kubernetes:
   namespace: default

config/kafka.yml

@@ -1,6 +1,6 @@
 ## Kafka authentication
-username:
-password:
+# username: "openIM"
+# password: "openIM123"
 
 # Producer acknowledgment settings
 producerAck:

docker-compose.yml

@@ -84,7 +84,6 @@ services:
       - ETCD_INITIAL_CLUSTER_TOKEN=tkn
       - ETCD_INITIAL_CLUSTER_STATE=new
       - ALLOW_NONE_AUTHENTICATION=no
-
       ## Optional: Enable etcd authentication by setting the following credentials
       # - ETCD_ROOT_USER=root
       # - ETCD_ROOT_PASSWORD=openIM123