Merge pull request #272 from wanjunlei/master

Continue to update tenants when some clusters fail
kubesphere · Jul 3, 2024 · b7c6a5d · b7c6a5d
2 parents 9a34483 + e7f861f
commit b7c6a5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sidecar/kubesphere/4.0.0/Makefile b/sidecar/kubesphere/4.0.0/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a Apache license
 # that can be found in the LICENSE file.
 
-IMG ?= kubesphere/notification-tenant-sidecar:v4.0.1
+IMG ?= kubesphere/notification-tenant-sidecar:v4.0.2
 AMD64 ?= -amd64
 
 all: docker-build

diff --git a/sidecar/kubesphere/4.0.0/backend.go b/sidecar/kubesphere/4.0.0/backend.go
@@ -50,7 +50,7 @@ func NewBackend(host, username, password string, interval time.Duration, batchSi
 
 func (b *Backend) FromNamespace(cluster, ns string) []string {
 	cm, ok := b.tenants[cluster]
-	if !ok {
+	if !ok || cm == nil {
 		return nil
 	}
 
@@ -92,7 +92,9 @@ func (b *Backend) reload() {
 	for _, cluster := range clusters {
 		m, err := getTenantInfoFromCluster(cluster, users)
 		if err != nil {
-			return
+			klog.Errorf("get tenant info from %s error, %s", cluster, err.Error())
+			tenants[cluster] = b.tenants[cluster]
+			continue
 		}
 
 		tenants[cluster] = m