fix(region): vendor update (#22827)

This commit is contained in:
屈轩
2025-07-03 15:16:30 +08:00
committed by GitHub
parent 8da39a625a
commit 0a8198d30d
4 changed files with 19 additions and 10 deletions
+1 -1
View File
@@ -95,7 +95,7 @@ require (
k8s.io/cri-api v0.22.17
k8s.io/klog/v2 v2.20.0
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250702132657-37b1f1b0b8bd
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250703065545-99af7a58eb9e
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
+2 -2
View File
@@ -1406,8 +1406,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250702132657-37b1f1b0b8bd h1:rSW+0utEdUqU76aD5PjvWPSRqr9bwdLprLb5wIsK8K8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250702132657-37b1f1b0b8bd/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250703065545-99af7a58eb9e h1:JERk+MVavD5m9Bnk+gALIWpjkbegqKnb/pYP31fPm5I=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250703065545-99af7a58eb9e/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
+1 -1
View File
@@ -1849,7 +1849,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250702132657-37b1f1b0b8bd
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250703065545-99af7a58eb9e
## explicit; go 1.21
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
+15 -6
View File
@@ -211,7 +211,7 @@ func (self *SDomainRecord) GetPolicyType() cloudprovider.TDnsPolicyType {
return cloudprovider.DnsPolicyTypeByCarrier
case "google", "baidu", "biying", "youdao", "yahoo", "qihu", "sougou":
return cloudprovider.DnsPolicyTypeBySearchEngine
case "oversea":
case "oversea", "internal":
return cloudprovider.DnsPolicyTypeByGeoLocation
case "aliyun", "os_aliyun":
return cloudprovider.DnsPolicyTypeByCloudPlatform
@@ -232,22 +232,31 @@ func (self *SDomainRecord) GetPolicyType() cloudprovider.TDnsPolicyType {
}
}
for _, prefix := range []string{
"cn_region",
"os_",
"aliyun_",
"cn_search",
"os_search",
} {
if strings.HasPrefix(self.Line, prefix) {
return cloudprovider.DnsPolicyTypeByGeoLocation
return cloudprovider.DnsPolicyTypeBySearchEngine
}
}
for _, prefix := range []string{
"aliyun_",
"cn_aliyun",
"os_aliyun",
} {
if strings.HasPrefix(self.Line, prefix) {
return cloudprovider.DnsPolicyTypeByCloudPlatform
}
}
for _, prefix := range []string{
"cn_region",
"os_",
} {
if strings.HasPrefix(self.Line, prefix) {
return cloudprovider.DnsPolicyTypeByGeoLocation
}
}
return cloudprovider.DnsPolicyTypeSimple
}
}