fix alibaba cloud ducp create record (#1682)

Co-authored-by: Raffaele Di Fazio <difazio.raffaele@gmail.com>
This commit is contained in:
LXM 2020-08-26 18:02:04 +08:00 committed by GitHub
parent aee691d8b5
commit 18296a8c07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions

View File

@ -3,6 +3,7 @@
- Improve errors context for AWS provider - Improve errors context for AWS provider
- Scaleway Provider (#1643) @Sh4d1 - Scaleway Provider (#1643) @Sh4d1
- Fix typos in documentation @ddymko - Fix typos in documentation @ddymko
- Fix: alibaba cloud keeping create record (#1682) @LXM
- Update all container registry references to use k8s.gcr.io @seanmalloy - Update all container registry references to use k8s.gcr.io @seanmalloy
## v0.7.3 - 2020-08-05 ## v0.7.3 - 2020-08-05

View File

@ -326,10 +326,6 @@ func (p *AlibabaCloudProvider) recordsForDNS() (endpoints []*endpoint.Endpoint,
recordType := recordList[0].Type recordType := recordList[0].Type
ttl := recordList[0].TTL ttl := recordList[0].TTL
if ttl == defaultAlibabaCloudRecordTTL {
ttl = 0
}
var targets []string var targets []string
for _, record := range recordList { for _, record := range recordList {
target := record.Value target := record.Value

View File

@ -276,6 +276,12 @@ func TestAlibabaCloudProvider_Records(t *testing.T) {
func TestAlibabaCloudProvider_ApplyChanges(t *testing.T) { func TestAlibabaCloudProvider_ApplyChanges(t *testing.T) {
p := newTestAlibabaCloudProvider(false) p := newTestAlibabaCloudProvider(false)
defaultTtlPlan := &endpoint.Endpoint{
DNSName: "ttl.container-service.top",
RecordType: "A",
RecordTTL: defaultAlibabaCloudRecordTTL,
Targets: endpoint.NewTargets("4.3.2.1"),
}
changes := plan.Changes{ changes := plan.Changes{
Create: []*endpoint.Endpoint{ Create: []*endpoint.Endpoint{
{ {
@ -284,6 +290,7 @@ func TestAlibabaCloudProvider_ApplyChanges(t *testing.T) {
RecordTTL: 300, RecordTTL: 300,
Targets: endpoint.NewTargets("4.3.2.1"), Targets: endpoint.NewTargets("4.3.2.1"),
}, },
defaultTtlPlan,
}, },
UpdateNew: []*endpoint.Endpoint{ UpdateNew: []*endpoint.Endpoint{
{ {
@ -308,13 +315,20 @@ func TestAlibabaCloudProvider_ApplyChanges(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Failed to get records: %v", err) t.Errorf("Failed to get records: %v", err)
} else { } else {
if len(endpoints) != 2 { if len(endpoints) != 3 {
t.Errorf("Incorrect number of records: %d", len(endpoints)) t.Errorf("Incorrect number of records: %d", len(endpoints))
} }
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
t.Logf("Endpoint for %++v", *endpoint) t.Logf("Endpoint for %++v", *endpoint)
} }
} }
for _, ep := range endpoints {
if ep.DNSName == defaultTtlPlan.DNSName {
if ep.RecordTTL != defaultTtlPlan.RecordTTL {
t.Error("default ttl execute error")
}
}
}
} }
func TestAlibabaCloudProvider_Records_PrivateZone(t *testing.T) { func TestAlibabaCloudProvider_Records_PrivateZone(t *testing.T) {