opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): 修复同步dns解析不生效问题 (#14560)

Browse Source
This commit is contained in:
屈轩
2022-07-02 17:59:55 +08:00
committed by GitHub
parent 63933bbec4
commit 182970ca66
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudprovider/dnszone.go
+2 -1
View File
@@ -675,8 +675,9 @@ func CompareDnsRecordSet(iRecords []ICloudDnsRecordSet, local []DnsRecordSet, de
remoteRecord, ok := remoteMaps[key]
if ok {
record.ExternalId = remoteRecord.ExternalId
remoteRecord.Id = record.Id
if !record.Equals(remoteRecord) {
updated = append(updated, record)
updated = append(updated, remoteRecord)
} else {
common = append(common, record)
}
pkg/compute/tasks/dnszone_syncstatus_task.go
+6
View File
@@ -61,6 +61,12 @@ func (self *DnsZoneSyncstatusTask) OnInit(ctx context.Context, obj db.IStandalon
if caches[i].Status != status {
caches[i].SetStatus(self.GetUserCred(), status, "")
}
if len(caches) == 1 {
account, _ := caches[i].GetCloudaccount()
if account != nil {
dnsZone.SyncDnsRecordSets(ctx, self.GetUserCred(), account.Provider, iZone)
}
}
}
}
pkg/multicloud/aliyun/shell/dns_domain.go
+6 -6
View File
@@ -36,8 +36,8 @@ import (
func init() {
type DnsProductListOptions struct {
PageNumber int `help:"page size"`
PageSize int `help:"page PageSize"`
PageNumber int `help:"page size" default:"1"`
PageSize int `help:"page PageSize" default:"20"`
}
shellutils.R(&DnsProductListOptions{}, "dnsproduct-list", "List dnsproduct", func(cli *aliyun.SRegion, args *DnsProductListOptions) error {
//products, e := cli.GetClient().DescribeDnsProductInstances(args.PageNumber, args.PageSize)
@@ -51,8 +51,8 @@ func init() {
})
type DomianListOptions struct {
PageNumber int `help:"page size"`
PageSize int `help:"page PageSize"`
PageNumber int `help:"page size" default:"1"`
PageSize int `help:"page PageSize" default:"20"`
}
shellutils.R(&DomianListOptions{}, "domain-list", "List Domain", func(cli *aliyun.SRegion, args *DomianListOptions) error {
sdomains, e := cli.GetClient().DescribeDomains(args.PageNumber, args.PageSize)
@@ -100,8 +100,8 @@ func init() {
type SDomainRecordListOptions struct {
DOMAINNAME string
PageNumber int `help:"page size"`
PageSize int `help:"page PageSize"`
PageNumber int `help:"page size" default:"1"`
PageSize int `help:"page PageSize" default:"20"`
}
shellutils.R(&SDomainRecordListOptions{}, "domainrecord-list", "List domainrecord", func(cli *aliyun.SRegion, args *SDomainRecordListOptions) error {
srecords, e := cli.GetClient().DescribeDomainRecords(args.DOMAINNAME, args.PageNumber, args.PageSize)