From 894e1f99d665c65f023f14e52618d53432b2fb43 Mon Sep 17 00:00:00 2001 From: Florian Liebhart Date: Tue, 5 Jul 2022 18:07:38 +0200 Subject: [PATCH] fix error for dns endpoint propagation Signed-off-by: Florian Liebhart --- cmd/controller/app/controller.go | 2 ++ cmd/controller/app/options/options.go | 3 ++- pkg/issuer/acme/dns/util/wait.go | 4 ++-- test/acme/options.go | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go index ced27e912..dd8eb7ede 100644 --- a/cmd/controller/app/controller.go +++ b/cmd/controller/app/controller.go @@ -291,6 +291,8 @@ func buildControllerContextFactory(ctx context.Context, opts *options.Controller ACMEHTTP01SolverRunAsNonRoot: ACMEHTTP01SolverRunAsNonRoot, HTTP01SolverImage: opts.ACMEHTTP01SolverImage, ACMEDNS01CheckMethod: opts.ACMEDNS01CheckMethod, + DnsOverHttpsJsonEndpoint: opts.DnsOverHttpsJsonEndpoint, + // Allows specifying a list of custom nameservers to perform HTTP01 checks on. HTTP01SolverNameservers: opts.ACMEHTTP01SolverNameservers, diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go index 17ad3eb9c..d8834b61b 100644 --- a/cmd/controller/app/options/options.go +++ b/cmd/controller/app/options/options.go @@ -150,7 +150,7 @@ const ( defaultACMEDNS01CheckMethod = dnsutil.ACMEDNS01CheckViaDNSLookup - defaultDnsOverHttpsJsonEndpoint = "https://8.8.8.8/resolve" + defaultDnsOverHttpsJsonEndpoint = dnsutil.DefaultDnsOverHttpsJsonEndpoint defaultClusterResourceNamespace = "kube-system" defaultNamespace = "" @@ -272,6 +272,7 @@ func NewControllerOptions() *ControllerOptions { DefaultAutoCertificateAnnotations: defaultAutoCertificateAnnotations, ACMEHTTP01SolverNameservers: []string{}, ACMEDNS01CheckMethod: defaultACMEDNS01CheckMethod, + DnsOverHttpsJsonEndpoint: defaultDnsOverHttpsJsonEndpoint, DNS01RecursiveNameservers: []string{}, DNS01RecursiveNameserversOnly: defaultDNS01RecursiveNameserversOnly, EnableCertificateOwnerRef: defaultEnableCertificateOwnerRef, diff --git a/pkg/issuer/acme/dns/util/wait.go b/pkg/issuer/acme/dns/util/wait.go index 4a99ff49d..a52b6e552 100644 --- a/pkg/issuer/acme/dns/util/wait.go +++ b/pkg/issuer/acme/dns/util/wait.go @@ -48,7 +48,7 @@ const ( ACMEDNS01CheckViaHTTPS = "dns-over-https" ) -const DefaultDnsOverHttpsJsonEndpoint = "https://8.8.8.8/resolve" +const DefaultDnsOverHttpsJsonEndpoint = "https://dns.google/resolve" var defaultNameservers = []string{ "8.8.8.8:53", @@ -157,7 +157,7 @@ func checkDNSPropagationWithHTTPS(fqdn, value string, dnsOverHttpsJsonEndpoint s req.Header.Add("accept", "application/dns-json") r, err := http.DefaultClient.Do(req) if err != nil { - return false, fmt.Errorf("Unable to lookup DNS via HTTPS: %s", err) + return false, fmt.Errorf("Unable to lookup the DNS via HTTPS: %s", err) } defer r.Body.Close() diff --git a/test/acme/options.go b/test/acme/options.go index f5656292c..09888ab16 100644 --- a/test/acme/options.go +++ b/test/acme/options.go @@ -78,7 +78,7 @@ func applyDefaults(f *fixture) { f.acmeDNS01CheckMethod = "dnslookup" } if f.dnsOverHttpsJsonEndpoint == "" { - f.dnsOverHttpsJsonEndpoint = "https://8.8.8.8/resolve" + f.dnsOverHttpsJsonEndpoint = "https://dns.google/resolve" } }