From 1d361bb4d3e63592e17ad5a484bea4c55f17d6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Wed, 22 Oct 2025 16:25:40 +0800
Subject: [PATCH] fix(keystone): fetch domain user count (#23590)

---
 pkg/keystone/models/domains.go | 8 ++++++++
 scripts/docker_push.sh         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/keystone/models/domains.go b/pkg/keystone/models/domains.go
index ecd0460203..9eab1deeed 100644
--- a/pkg/keystone/models/domains.go
+++ b/pkg/keystone/models/domains.go
@@ -27,6 +27,7 @@ import (
 	"yunion.io/x/pkg/tristate"
 	"yunion.io/x/pkg/util/rbacscope"
 	"yunion.io/x/pkg/util/timeutils"
+	"yunion.io/x/pkg/utils"
 	"yunion.io/x/sqlchemy"
 
 	api "yunion.io/x/onecloud/pkg/apis/identity"
@@ -394,6 +395,13 @@ type SDomainUsageCount struct {
 
 func (m *SDomainManager) query(manager db.IModelManager, field string, domainIds []string, filter func(*sqlchemy.SQuery) *sqlchemy.SQuery) *sqlchemy.SSubQuery {
 	q := manager.Query()
+	if utils.IsInStringArray(manager.Keyword(), []string{
+		GroupManager.Keyword(),
+		UserManager.Keyword(),
+		ProjectManager.Keyword(),
+	}) {
+		q = q.IsFalse("pending_deleted")
+	}
 
 	if filter != nil {
 		q = filter(q)
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index 9f20339309..83e0857c55 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -327,5 +327,5 @@ for component in $COMPONENTS; do
     if [[ $component == host-image ]]; then
         continue
     fi
-    show_update_cmd $component
+    show_update_cmd $component $ARCH
 done