diff --git a/internal/web/actions/default/clusters/cluster/settings/dns/index.go b/internal/web/actions/default/clusters/cluster/settings/dns/index.go
index 5069518f..781c723b 100644
--- a/internal/web/actions/default/clusters/cluster/settings/dns/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/dns/index.go
@@ -46,6 +46,12 @@ func (this *IndexAction) RunGet(params struct {
this.Data["domainName"] = dnsInfoResp.Domain.Name
}
+ if len(dnsInfoResp.CnameRecords) == 0 {
+ this.Data["cnameRecords"] = []string{}
+ } else {
+ this.Data["cnameRecords"] = dnsInfoResp.CnameRecords
+ }
+
this.Show()
}
@@ -56,6 +62,7 @@ func (this *IndexAction) RunPost(params struct {
DnsName string
NodesAutoSync bool
ServersAutoSync bool
+ CnameRecords []string
Must *actions.Must
CSRF *actionutils.CSRF
@@ -97,6 +104,7 @@ func (this *IndexAction) RunPost(params struct {
DnsDomainId: params.DnsDomainId,
NodesAutoSync: params.NodesAutoSync,
ServersAutoSync: params.ServersAutoSync,
+ CnameRecords: params.CnameRecords,
})
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/dns/clusters/cluster.go b/internal/web/actions/default/dns/clusters/cluster.go
index 871ec491..86467f34 100644
--- a/internal/web/actions/default/dns/clusters/cluster.go
+++ b/internal/web/actions/default/dns/clusters/cluster.go
@@ -61,6 +61,12 @@ func (this *ClusterAction) RunGet(params struct {
dnsMap["providerTypeName"] = dnsResp.Provider.TypeName
}
+ if len(dnsResp.CnameRecords) > 0 {
+ dnsMap["cnameRecords"] = dnsResp.CnameRecords
+ } else {
+ dnsMap["cnameRecords"] = []string{}
+ }
+
this.Data["dnsInfo"] = dnsMap
// 节点DNS解析记录
diff --git a/internal/web/actions/default/dns/updateClusterPopup.go b/internal/web/actions/default/dns/updateClusterPopup.go
index 6e1116de..cab1031c 100644
--- a/internal/web/actions/default/dns/updateClusterPopup.go
+++ b/internal/web/actions/default/dns/updateClusterPopup.go
@@ -46,6 +46,12 @@ func (this *UpdateClusterPopupAction) RunGet(params struct {
this.Data["providerId"] = 0
}
+ if len(dnsResp.CnameRecords) == 0 {
+ this.Data["cnameRecords"] = []string{}
+ } else {
+ this.Data["cnameRecords"] = dnsResp.CnameRecords
+ }
+
// 所有服务商
providerTypesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{})
if err != nil {
@@ -70,6 +76,7 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
DomainId int64
NodesAutoSync bool
ServersAutoSync bool
+ CnameRecords []string
Must *actions.Must
CSRF *actionutils.CSRF
@@ -103,6 +110,7 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
DnsDomainId: params.DomainId,
NodesAutoSync: params.NodesAutoSync,
ServersAutoSync: params.ServersAutoSync,
+ CnameRecords: params.CnameRecords,
})
if err != nil {
this.ErrorPage(err)
diff --git a/web/public/js/components/common/labels.js b/web/public/js/components/common/labels.js
index 1e72841a..4d541e35 100644
--- a/web/public/js/components/common/labels.js
+++ b/web/public/js/components/common/labels.js
@@ -6,7 +6,12 @@ Vue.component("label-on", {
// 文字代码标签
Vue.component("code-label", {
- template: `
当前集群的子域名,和主域名一起组成集群节点的子域名。
+除了集群节点记录之外,自动加入的CNAME记录,比如
子域名和主域名共同组成集群的域名。
除了集群节点记录之外,自动加入的CNAME记录,比如