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

Use StringSlice

Browse Source
This commit is contained in:
Louis Taylor 2018-07-05 14:37:08 +01:00
parent ea6a5472e2
commit 14873c248a
No known key found for this signature in database
GPG Key ID: 8E81A6DAE13E7098
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package app
import (
"fmt"
"os"
"strings"
"sync"
"time"
@ -97,10 +96,8 @@ func buildControllerContext(opts *options.ControllerOptions) (*controller.Contex
return nil, nil, fmt.Errorf("error creating kubernetes client: %s", err.Error())
}
nameservers := []string{}
if opts.DNS01Nameservers != "" {
nameservers = strings.Split(opts.DNS01Nameservers, ",")
} else {
nameservers := opts.DNS01Nameservers
if len(nameservers) == 0 {
nameservers = dnsutil.RecursiveNameservers
}

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

@ -31,7 +31,7 @@ type ControllerOptions struct {
DefaultACMEIssuerDNS01ProviderName string
// DNS01Nameservers allows specifying a list of custom nameservers to perform DNS checks
DNS01Nameservers string
DNS01Nameservers []string
}
const (
@ -51,8 +51,6 @@ const (
defaultTLSACMEIssuerKind = "Issuer"
defaultACMEIssuerChallengeType = "http01"
defaultACMEIssuerDNS01ProviderName = ""
defaultDNS01Nameservers = ""
)
var (
@ -74,7 +72,7 @@ func NewControllerOptions() *ControllerOptions {
DefaultIssuerKind: defaultTLSACMEIssuerKind,
DefaultACMEIssuerChallengeType: defaultACMEIssuerChallengeType,
DefaultACMEIssuerDNS01ProviderName: defaultACMEIssuerDNS01ProviderName,
DNS01Nameservers: defaultDNS01Nameservers,
DNS01Nameservers: []string{},
}
}
@ -126,7 +124,7 @@ func (s *ControllerOptions) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.DefaultACMEIssuerDNS01ProviderName, "default-acme-issuer-dns01-provider-name", defaultACMEIssuerDNS01ProviderName, ""+
"Required if --default-acme-issuer-challenge-type is set to dns01. The DNS01 provider to use for ingresses using ACME dns01 "+
"validation that do not explicitly state a dns provider.")
fs.StringVar(&s.DNS01Nameservers, "dns01-self-check-nameservers", defaultDNS01Nameservers, ""+
fs.StringSliceVar(&s.DNS01Nameservers, "dns01-self-check-nameservers", []string{}, ""+
"A list of comma seperated DNS server endpoints used for DNS01 check requests. "+
"")
}