From f0a3e081e500b6744c3f6ac541828adee54ad2e0 Mon Sep 17 00:00:00 2001 From: Aditya Sundaramurthy Date: Mon, 11 Mar 2019 15:52:23 +0100 Subject: [PATCH 1/2] Fixes trimming of zone inferred via zone discovery over configured 'hostedZoneName' Signed-off-by: Aditya Sundaramurthy --- pkg/issuer/acme/dns/azuredns/azuredns.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/issuer/acme/dns/azuredns/azuredns.go b/pkg/issuer/acme/dns/azuredns/azuredns.go index def805340..473b71d2c 100644 --- a/pkg/issuer/acme/dns/azuredns/azuredns.go +++ b/pkg/issuer/acme/dns/azuredns/azuredns.go @@ -95,7 +95,7 @@ func (c *DNSProvider) CleanUp(domain, fqdn, value string) error { context.TODO(), c.resourceGroupName, z, - c.trimFqdn(fqdn), + c.trimFqdn(fqdn, z), dns.TXT, "") if err != nil { @@ -124,7 +124,7 @@ func (c *DNSProvider) createRecord(fqdn, value string, ttl int) error { context.TODO(), c.resourceGroupName, z, - c.trimFqdn(fqdn), + c.trimFqdn(fqdn, z), dns.TXT, *rparams, "", "") @@ -157,6 +157,6 @@ func (c *DNSProvider) getHostedZoneName(fqdn string) (string, error) { return util.UnFqdn(z), nil } -func (c *DNSProvider) trimFqdn(fqdn string) string { - return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+c.zoneName) +func (c *DNSProvider) trimFqdn(fqdn string, zone string) string { + return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+zone) } From 0690592a2f5cf842747d04bd139b4118cb056631 Mon Sep 17 00:00:00 2001 From: Aditya Sundaramurthy Date: Tue, 12 Mar 2019 00:23:25 +0100 Subject: [PATCH 2/2] Fallback to `hostedZoneName` param if set in `ClusterIssuer` CRD Signed-off-by: Aditya Sundaramurthy --- pkg/issuer/acme/dns/azuredns/azuredns.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/issuer/acme/dns/azuredns/azuredns.go b/pkg/issuer/acme/dns/azuredns/azuredns.go index 473b71d2c..4f00a63f2 100644 --- a/pkg/issuer/acme/dns/azuredns/azuredns.go +++ b/pkg/issuer/acme/dns/azuredns/azuredns.go @@ -129,7 +129,7 @@ func (c *DNSProvider) createRecord(fqdn, value string, ttl int) error { *rparams, "", "") if err != nil { - klog.Infof("Error creating TXT: %s, %v", c.zoneName, err) + klog.Infof("Error creating TXT: %s, %v", z, err) return err } return nil @@ -157,6 +157,11 @@ func (c *DNSProvider) getHostedZoneName(fqdn string) (string, error) { return util.UnFqdn(z), nil } +// Trims DNS zone from the fqdn. Defaults to DNSProvider.zoneName if it is specified. func (c *DNSProvider) trimFqdn(fqdn string, zone string) string { - return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+zone) + z := zone + if len(c.zoneName) > 0 { + z = c.zoneName + } + return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+z) }