Add etcd as a service discovery mechanism

config/zookeeper.yml

@@ -1,6 +0,0 @@
-
-schema: openim
-address: [ localhost:12181 ]
-username: ''
-password: ''
-

internal/rpc/conversation/conversaion.go

@@ -48,10 +48,9 @@ type conversationServer struct {
 }
 
 type Config struct {
-	RpcConfig     config.Conversation
-	RedisConfig   config.Redis
-	MongodbConfig config.Mongo
-	//	ZookeeperConfig    config.ZooKeeper
+	RpcConfig          config.Conversation
+	RedisConfig        config.Redis
+	MongodbConfig      config.Mongo
 	NotificationConfig config.Notification
 	Share              config.Share
 	LocalCacheConfig   config.LocalCache

pkg/common/cmd/constant.go

@@ -26,7 +26,6 @@ var (
 	LocalCacheConfigFileName         string
 	KafkaConfigFileName              string
 	RedisConfigFileName              string
-	ZookeeperConfigFileName          string
 	MongodbConfigFileName            string
 	MinioConfigFileName              string
 	LogConfigFileName                string
@@ -55,7 +54,6 @@ func init() {
 	LocalCacheConfigFileName = "local-cache.yml"
 	KafkaConfigFileName = "kafka.yml"
 	RedisConfigFileName = "redis.yml"
-	ZookeeperConfigFileName = "zookeeper.yml"
 	MongodbConfigFileName = "mongodb.yml"
 	MinioConfigFileName = "minio.yml"
 	LogConfigFileName = "log.yml"
@@ -76,7 +74,7 @@ func init() {
 	ConfigEnvPrefixMap = make(map[string]string)
 	fileNames := []string{
 		FileName, NotificationFileName, ShareFileName, WebhooksConfigFileName,
-		KafkaConfigFileName, RedisConfigFileName, ZookeeperConfigFileName,
+		KafkaConfigFileName, RedisConfigFileName,
 		MongodbConfigFileName, MinioConfigFileName, LogConfigFileName,
 		OpenIMAPICfgFileName, OpenIMCronTaskCfgFileName, OpenIMMsgGatewayCfgFileName,
 		OpenIMMsgTransferCfgFileName, OpenIMPushCfgFileName, OpenIMRPCAuthCfgFileName,

pkg/common/discoveryregister/zookeeper/zookeeper.go

@@ -1,44 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package zookeeper
-
-import (
-	"os"
-	"strings"
-)
-
-// getEnv returns the value of an environment variable if it exists, otherwise it returns the fallback value.
-func getEnv(key, fallback string) string {
-	if value, exists := os.LookupEnv(key); exists {
-		return value
-	}
-	return fallback
-}
-
-// getZkAddrFromEnv returns the Zookeeper addresses combined from the ZOOKEEPER_ADDRESS and ZOOKEEPER_PORT environment variables.
-// If the environment variables are not set, it returns the fallback value.
-func getZkAddrFromEnv(fallback []string) []string {
-	address, addrExists := os.LookupEnv("ZOOKEEPER_ADDRESS")
-	port, portExists := os.LookupEnv("ZOOKEEPER_PORT")
-
-	if addrExists && portExists {
-		addresses := strings.Split(address, ",")
-		for i, addr := range addresses {
-			addresses[i] = addr + ":" + port
-		}
-		return addresses
-	}
-	return fallback
-}