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

删除集群的时候，同时删除对应的域名解析/集群切换二级域名先删除再添加新的域名解析

Browse Source
This commit is contained in:
刘祥超
2022-09-22 14:09:28 +08:00
parent 702a0f1ecf
commit 316cd36f71
5 changed files with 84 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/db/models/node_cluster_dao.go
View File

@@ -466,7 +466,7 @@ func (this *NodeClusterDAO) FindClusterDNSInfo(tx *dbs.Tx, clusterId int64, cach
one, err := this.Query(tx).
Pk(clusterId).
Result("id", "name", "dnsName", "dnsDomainId", "dns", "isOn").
Result("id", "name", "dnsName", "dnsDomainId", "dns", "isOn", "state").
Find()
if err != nil {
return nil, err
@@ -510,10 +510,16 @@ func (this *NodeClusterDAO) UpdateClusterDNS(tx *dbs.Tx, clusterId int64, dnsNam
var oldCluster = oldOne.(*NodeCluster)
var oldDNSDomainId = int64(oldCluster.DnsDomainId)
var shouldRemoveOld = false
if (oldDNSDomainId > 0 && oldDNSDomainId != dnsDomainId) || (oldCluster.DnsName != dnsName) {
err = dns.SharedDNSTaskDAO.CreateClusterRemoveTask(tx, clusterId, oldDNSDomainId, oldCluster.DnsName)
if err != nil {
return err
if oldDNSDomainId == dnsDomainId {
// 如果只是换子域名，需要在新的域名添加之前，先删除老的子域名，防止无法添加CNAME
err = dns.SharedDNSTaskDAO.CreateClusterRemoveTask(tx, clusterId, oldDNSDomainId, oldCluster.DnsName)
if err != nil {
return err
}
} else {
shouldRemoveOld = true
}
}
@@ -548,7 +554,20 @@ func (this *NodeClusterDAO) UpdateClusterDNS(tx *dbs.Tx, clusterId int64, dnsNam
if err != nil {
return err
}
return this.NotifyDNSUpdate(tx, clusterId)
err = this.NotifyDNSUpdate(tx, clusterId)
if err != nil {
return err
}
// 删除老的记录
if shouldRemoveOld {
err = dns.SharedDNSTaskDAO.CreateClusterRemoveTask(tx, clusterId, oldDNSDomainId, oldCluster.DnsName)
if err != nil {
return err
}
}
return nil
}
// FindClusterAdminId 查找集群所属管理员