Merge pull request #379 from zexi/automated-cherry-pick-of-#378-upstr…

…eam-release-3.12 Automated cherry pick of #378: fix(kubeserver): Not found namespace by cluster
yunionio · Nov 20, 2024 · 30fc353 · 30fc353
2 parents 4e53f25 + e40b7c7
commit 30fc353
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/kubeserver/models/namespaceresource.go b/pkg/kubeserver/models/namespaceresource.go
@@ -214,13 +214,13 @@ func (m *SNamespaceResourceBaseManager) GetGCQuery() *sqlchemy.SQuery {
 }
 
 func (m *SNamespaceResourceBaseManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, input *api.NamespaceResourceListInput) (*sqlchemy.SQuery, error) {
-	log.Infof("=====namespace list input: %s", jsonutils.Marshal(input))
 	q, err := m.SClusterResourceBaseManager.ListItemFilter(ctx, q, userCred, &input.ClusterResourceListInput)
 	if err != nil {
 		return nil, errors.Wrapf(err, "SClusterResourceBaseManager.ListItemFilter with input: %s", jsonutils.Marshal(input.ClusterResourceListInput))
 	}
+	log.Infof("=====namespace list input: %s", jsonutils.Marshal(input))
 	if input.Namespace != "" {
-		ns, err := GetNamespaceManager().GetByIdOrName(userCred, input.Cluster, input.Namespace)
+		ns, err := GetNamespaceManager().GetByIdOrName(userCred, input.ClusterId, input.Namespace)
 		if err != nil {
 			return nil, errors.Wrapf(err, "Not found namespace %s by cluster %s", input.Namespace, input.Cluster)
 		}