TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pl/kubernetes: drop the comma parsing (#1453)

Browse source 
Let caddyfile parser give us the token, the comma sep thing also didn't
work.

Fixes #1446
This commit is contained in:
Miek Gieben 2018-01-28 16:40:10 +00:00 • committed by Yong Tang
parent d27be86e3e
commit 399073ec6b
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugin/kubernetes/README.md
View file

@ -30,7 +30,7 @@ all the zones the plugin should be authoritative for.
``` ```
kubernetes [ZONES...] { kubernetes [ZONES...] {
resyncperiod DURATION resyncperiod DURATION
endpoint URL endpoint URL [URL...]
tls CERT KEY CACERT tls CERT KEY CACERT
namespaces NAMESPACE... namespaces NAMESPACE...
labels EXPRESSION labels EXPRESSION
@ -45,8 +45,8 @@ kubernetes [ZONES...] {
* `resyncperiod` specifies the Kubernetes data API **DURATION** period. * `resyncperiod` specifies the Kubernetes data API **DURATION** period.
* `endpoint` specifies the **URL** for a remote k8s API endpoint. * `endpoint` specifies the **URL** for a remote k8s API endpoint.
If omitted, it will connect to k8s in-cluster using the cluster service account. If omitted, it will connect to k8s in-cluster using the cluster service account.
Multiple k8s API endpoints could be specified, separated by `,`s, e.g. Multiple k8s API endpoints could be specified:
`endpoint http://k8s-endpoint1:8080,http://k8s-endpoint2:8080`. CoreDNS `endpoint http://k8s-endpoint1:8080 http://k8s-endpoint2:8080`. CoreDNS
will automatically perform a healthcheck and proxy to the healthy k8s API endpoint. will automatically perform a healthcheck and proxy to the healthy k8s API endpoint.
* `tls` **CERT** **KEY** **CACERT** are the TLS cert, key and the CA cert file names for remote k8s connection. * `tls` **CERT** **KEY** **CACERT** are the TLS cert, key and the CA cert file names for remote k8s connection.
This option is ignored if connecting in-cluster (i.e. endpoint is not specified). This option is ignored if connecting in-cluster (i.e. endpoint is not specified).

4
plugin/kubernetes/setup.go
View file

@ -135,9 +135,7 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, dnsControlOpts, error) {
case "endpoint": case "endpoint":
args := c.RemainingArgs() args := c.RemainingArgs()
if len(args) > 0 { if len(args) > 0 {
for _, endpoint := range strings.Split(args[0], ",") { k8s.APIServerList = args
k8s.APIServerList = append(k8s.APIServerList, strings.TrimSpace(endpoint))
}
continue continue
} }
return nil, opts, c.ArgErr() return nil, opts, c.ArgErr()

2
plugin/kubernetes/setup_test.go
View file

@ -64,7 +64,7 @@ func TestKubernetesParse(t *testing.T) {
}, },
{ {
`kubernetes coredns.local { `kubernetes coredns.local {
endpoint http://localhost:9090 endpoint http://localhost:9090 http://localhost:9091
}`, }`,
false, false,
"", "",