diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go index e87a495e..3e054a9c 100644 --- a/internal/web/actions/default/clusters/cluster/nodes.go +++ b/internal/web/actions/default/clusters/cluster/nodes.go @@ -142,8 +142,17 @@ func (this *NodesAction) RunGet(params struct { this.ErrorPage(err) return } - ipAddresses := []maps.Map{} + var ipAddresses = []maps.Map{} for _, addr := range ipAddressesResp.NodeIPAddresses { + // 专属集群 + var addrClusterMaps = []maps.Map{} + for _, addrCluster := range addr.NodeClusters { + addrClusterMaps = append(addrClusterMaps, maps.Map{ + "id": addrCluster.Id, + "name": addrCluster.Name, + }) + } + ipAddresses = append(ipAddresses, maps.Map{ "id": addr.Id, "name": addr.Name, @@ -151,6 +160,7 @@ func (this *NodesAction) RunGet(params struct { "canAccess": addr.CanAccess, "isUp": addr.IsUp, "isOn": addr.IsOn, + "clusters": addrClusterMaps, }) } diff --git a/internal/web/actions/default/clusters/nodes.go b/internal/web/actions/default/clusters/nodes.go index 5f86fb5d..079ebff2 100644 --- a/internal/web/actions/default/clusters/nodes.go +++ b/internal/web/actions/default/clusters/nodes.go @@ -144,8 +144,17 @@ func (this *NodesAction) RunGet(params struct { this.ErrorPage(err) return } - ipAddresses := []maps.Map{} + var ipAddresses = []maps.Map{} for _, addr := range ipAddressesResp.NodeIPAddresses { + // 专属集群 + var addrClusterMaps = []maps.Map{} + for _, addrCluster := range addr.NodeClusters { + addrClusterMaps = append(addrClusterMaps, maps.Map{ + "id": addrCluster.Id, + "name": addrCluster.Name, + }) + } + ipAddresses = append(ipAddresses, maps.Map{ "id": addr.Id, "name": addr.Name, @@ -153,6 +162,7 @@ func (this *NodesAction) RunGet(params struct { "canAccess": addr.CanAccess, "isUp": addr.IsUp, "isOn": addr.IsOn, + "clusters": addrClusterMaps, }) } @@ -175,7 +185,7 @@ func (this *NodesAction) RunGet(params struct { } // DNS - dnsRouteNames := []string{} + var dnsRouteNames = []string{} for _, route := range node.DnsRoutes { dnsRouteNames = append(dnsRouteNames, route.Name) } diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index 54c61aa5..aebd2e60 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -94,6 +94,11 @@