weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1466 from logicfox/bugfix/fix-zone-discovery

Browse Source 
[Azure DNS] Fixes trimming of zone inferred via zone discovery
This commit is contained in:
jetstack-bot 2019-03-12 11:00:10 +00:00 committed by GitHub
commit cbfd4fc89c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/issuer/acme/dns/azuredns/azuredns.go
View File

@ -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,12 +124,12 @@ 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, "", "")
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
}
func (c *DNSProvider) trimFqdn(fqdn string) string {
return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+c.zoneName)
// Trims DNS zone from the fqdn. Defaults to DNSProvider.zoneName if it is specified.
func (c *DNSProvider) trimFqdn(fqdn string, zone string) string {
z := zone
if len(c.zoneName) > 0 {
z = c.zoneName
}
return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+z)
}