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

fix error for dns endpoint propagation

Browse Source 
Signed-off-by: Florian Liebhart <flo.liebhart@gmail.com>
This commit is contained in:
Florian Liebhart 2022-07-05 18:07:38 +02:00
parent 00fb76f9b7
commit 894e1f99d6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/controller/app/controller.go
View File

@ -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,

3
cmd/controller/app/options/options.go
View File

@ -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,

4
pkg/issuer/acme/dns/util/wait.go
View File

@ -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()

2
test/acme/options.go
View File

@ -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"
}
}