TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-28 00:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询节点DNS信息时可以区分节点是否已安装

Browse Source
This commit is contained in:
刘祥超
2023-03-18 16:05:10 +08:00
parent 2c17675b6a
commit 8c4d2e7301
6 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/services/service_dns_domain.go
View File

@@ -454,7 +454,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster,
}
// 节点域名
nodes, err := models.SharedNodeDAO.FindAllEnabledNodesDNSWithClusterId(tx, clusterId, true, dnsConfig != nil && dnsConfig.IncludingLnNodes)
nodes, err := models.SharedNodeDAO.FindAllEnabledNodesDNSWithClusterId(tx, clusterId, true, dnsConfig != nil && dnsConfig.IncludingLnNodes, true)
if err != nil {
return nil, nil, nil, 0, 0, false, false, err
}

3
internal/rpc/services/service_node.go
View File

@@ -812,6 +812,7 @@ func (this *NodeService) UpdateNodeStatus(ctx context.Context, req *pb.UpdateNod
if err != nil {
return nil, err
}
return this.Success()
}
@@ -1321,7 +1322,7 @@ func (this *NodeService) FindAllEnabledNodesDNSWithNodeClusterId(ctx context.Con
return nil, err
}
nodes, err := models.SharedNodeDAO.FindAllEnabledNodesDNSWithClusterId(tx, req.NodeClusterId, true, dnsConfig != nil && dnsConfig.IncludingLnNodes)
nodes, err := models.SharedNodeDAO.FindAllEnabledNodesDNSWithClusterId(tx, req.NodeClusterId, true, dnsConfig != nil && dnsConfig.IncludingLnNodes, req.IsInstalled)
if err != nil {
return nil, err
}

26
internal/rpc/services/service_node_cluster.go
View File

@@ -642,12 +642,28 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithDNSDomainId(ctx co
result := []*pb.NodeCluster{}
for _, cluster := range clusters {
// 默认线路
domainId := int64(cluster.DnsDomainId)
domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, domainId, nil)
if err != nil {
return nil, err
}
if domain == nil {
continue
}
defaultRoute, err := dnsutils.FindDefaultDomainRoute(tx, domain)
if err != nil {
return nil, err
}
result = append(result, &pb.NodeCluster{
Id: int64(cluster.Id),
Name: cluster.Name,
DnsName: cluster.DnsName,
DnsDomainId: int64(cluster.DnsDomainId),
IsOn: cluster.IsOn,
Id: int64(cluster.Id),
Name: cluster.Name,
DnsName: cluster.DnsName,
DnsDomainId: int64(cluster.DnsDomainId),
DnsDefaultRoute: defaultRoute,
IsOn: cluster.IsOn,
})
}
return &pb.FindAllEnabledNodeClustersWithDNSDomainIdResponse{NodeClusters: result}, nil