Skip to content

C
Coredns
Commit 7f5086e9 authored by Miek Gieben's avatar Miek Gieben Committed by GitHub
Browse files
Options

mw/kubernetes: don't export Pod-mode constants. (#959) 

* mw/kubernetes: don't export Pod-mode constants.

* merged
parent 12db6618
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
middleware/kubernetes/handler_test.go
View file @ 7f5086e9
...@@ -185,13 +185,13 @@ func TestServeDNS(t *testing.T) { ...@@ -185,13 +185,13 @@ func TestServeDNS(t *testing.T) {
ctx := context.TODO() ctx := context.TODO()
runServeDNSTests(ctx, t, dnsTestCases, k) runServeDNSTests(ctx, t, dnsTestCases, k)
k.PodMode = PodModeDisabled k.podMode = podModeDisabled
runServeDNSTests(ctx, t, podModeDisabledCases, k) runServeDNSTests(ctx, t, podModeDisabledCases, k)
k.PodMode = PodModeInsecure k.podMode = podModeInsecure
runServeDNSTests(ctx, t, podModeInsecureCases, k) runServeDNSTests(ctx, t, podModeInsecureCases, k)
k.PodMode = PodModeVerified k.podMode = podModeVerified
runServeDNSTests(ctx, t, podModeVerifiedCases, k) runServeDNSTests(ctx, t, podModeVerifiedCases, k)
} }
......
middleware/kubernetes/kubernetes.go
View file @ 7f5086e9
...@@ -38,7 +38,7 @@ type Kubernetes struct { ...@@ -38,7 +38,7 @@ type Kubernetes struct {
APIClientKey string APIClientKey string
APIConn dnsController APIConn dnsController
Namespaces map[string]bool Namespaces map[string]bool
PodMode string podMode string
Fallthrough bool Fallthrough bool
primaryZoneIndex int primaryZoneIndex int
...@@ -53,19 +53,19 @@ func New(zones []string) *Kubernetes { ...@@ -53,19 +53,19 @@ func New(zones []string) *Kubernetes {
k.Zones = zones k.Zones = zones
k.Namespaces = make(map[string]bool) k.Namespaces = make(map[string]bool)
k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("127.0.0.1") } k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("127.0.0.1") }
k.PodMode = PodModeDisabled k.podMode = podModeDisabled
k.Proxy = proxy.Proxy{} k.Proxy = proxy.Proxy{}
return k return k
} }
const ( const (
// PodModeDisabled is the default value where pod requests are ignored // podModeDisabled is the default value where pod requests are ignored
PodModeDisabled = "disabled" podModeDisabled = "disabled"
// PodModeVerified is where Pod requests are answered only if they exist // podModeVerified is where Pod requests are answered only if they exist
PodModeVerified = "verified" podModeVerified = "verified"
// PodModeInsecure is where pod requests are answered without verfying they exist // podModeInsecure is where pod requests are answered without verfying they exist
PodModeInsecure = "insecure" podModeInsecure = "insecure"
// DNSSchemaVersion is the schema version: https://github.com/kubernetes/dns/blob/master/docs/specification.md // DNSSchemaVersion is the schema version: https://github.com/kubernetes/dns/blob/master/docs/specification.md
DNSSchemaVersion = "1.0.1" DNSSchemaVersion = "1.0.1"
) )
...@@ -277,7 +277,7 @@ func (k *Kubernetes) initKubeCache(opts dnsControlOpts) (err error) { ...@@ -277,7 +277,7 @@ func (k *Kubernetes) initKubeCache(opts dnsControlOpts) (err error) {
opts.selector = &selector opts.selector = &selector
} }
opts.initPodCache = k.PodMode == PodModeVerified opts.initPodCache = k.podMode == podModeVerified
k.APIConn = newdnsController(kubeClient, opts) k.APIConn = newdnsController(kubeClient, opts)
...@@ -360,7 +360,7 @@ func (k *Kubernetes) getRecordsForK8sItems(services []kService, pods []kPod, zon ...@@ -360,7 +360,7 @@ func (k *Kubernetes) getRecordsForK8sItems(services []kService, pods []kPod, zon
} }
func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error) { func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error) {
if k.PodMode == PodModeDisabled { if k.podMode == podModeDisabled {
return pods, errPodsDisabled return pods, errPodsDisabled
} }
...@@ -371,7 +371,7 @@ func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error ...@@ -371,7 +371,7 @@ func (k *Kubernetes) findPods(namespace, podname string) (pods []kPod, err error
ip = strings.Replace(podname, "-", ":", -1) ip = strings.Replace(podname, "-", ":", -1)
} }
if k.PodMode == PodModeInsecure { if k.podMode == podModeInsecure {
s := kPod{name: podname, namespace: namespace, addr: ip} s := kPod{name: podname, namespace: namespace, addr: ip}
pods = append(pods, s) pods = append(pods, s)
return pods, nil return pods, nil
......
middleware/kubernetes/setup.go
View file @ 7f5086e9
...@@ -101,8 +101,8 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, dnsControlOpts, error) { ...@@ -101,8 +101,8 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, dnsControlOpts, error) {
args := c.RemainingArgs() args := c.RemainingArgs()
if len(args) == 1 { if len(args) == 1 {
switch args[0] { switch args[0] {
case PodModeDisabled, PodModeInsecure, PodModeVerified: case podModeDisabled, podModeInsecure, podModeVerified:
k8s.PodMode = args[0] k8s.podMode = args[0]
default: default:
return nil, opts, fmt.Errorf("wrong value for pods: %s, must be one of: disabled, verified, insecure", args[0]) return nil, opts, fmt.Errorf("wrong value for pods: %s, must be one of: disabled, verified, insecure", args[0])
} }
......
middleware/kubernetes/setup_test.go
View file @ 7f5086e9
...@@ -31,7 +31,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -31,7 +31,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -43,7 +43,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -43,7 +43,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -56,7 +56,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -56,7 +56,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -70,7 +70,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -70,7 +70,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -84,7 +84,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -84,7 +84,7 @@ func TestKubernetesParse(t *testing.T) {
1, 1,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -98,7 +98,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -98,7 +98,7 @@ func TestKubernetesParse(t *testing.T) {
2, 2,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -112,7 +112,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -112,7 +112,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
30 * time.Second, 30 * time.Second,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -126,7 +126,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -126,7 +126,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
15 * time.Minute, 15 * time.Minute,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -140,7 +140,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -140,7 +140,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"environment=prod", "environment=prod",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -154,7 +154,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -154,7 +154,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"application=nginx,environment in (production,qa,staging)", "application=nginx,environment in (production,qa,staging)",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -172,10 +172,11 @@ func TestKubernetesParse(t *testing.T) { ...@@ -172,10 +172,11 @@ func TestKubernetesParse(t *testing.T) {
2, 2,
15 * time.Minute, 15 * time.Minute,
"application=nginx,environment in (production,qa,staging)", "application=nginx,environment in (production,qa,staging)",
PodModeDisabled, podModeDisabled,
true, true,
nil, nil,
}, },
// negative
{ {
`kubernetes coredns.local { `kubernetes coredns.local {
endpoint endpoint
...@@ -186,7 +187,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -186,7 +187,7 @@ func TestKubernetesParse(t *testing.T) {
-1, -1,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -200,7 +201,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -200,7 +201,7 @@ func TestKubernetesParse(t *testing.T) {
-1, -1,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -214,7 +215,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -214,7 +215,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
0 * time.Minute, 0 * time.Minute,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -228,7 +229,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -228,7 +229,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
0 * time.Second, 0 * time.Second,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -242,7 +243,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -242,7 +243,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
0 * time.Second, 0 * time.Second,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -256,7 +257,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -256,7 +257,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
0 * time.Second, 0 * time.Second,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -270,7 +271,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -270,7 +271,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
0 * time.Second, 0 * time.Second,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -285,7 +286,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -285,7 +286,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -300,7 +301,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -300,7 +301,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeInsecure, podModeInsecure,
false, false,
nil, nil,
}, },
...@@ -315,7 +316,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -315,7 +316,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeVerified, podModeVerified,
false, false,
nil, nil,
}, },
...@@ -330,7 +331,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -330,7 +331,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeVerified, podModeVerified,
false, false,
nil, nil,
}, },
...@@ -345,7 +346,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -345,7 +346,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -360,7 +361,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -360,7 +361,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
[]string{"13.14.15.16:53"}, []string{"13.14.15.16:53"},
}, },
...@@ -375,7 +376,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -375,7 +376,7 @@ func TestKubernetesParse(t *testing.T) {
0, 0,
defaultResyncPeriod, defaultResyncPeriod,
"", "",
PodModeDisabled, podModeDisabled,
false, false,
nil, nil,
}, },
...@@ -436,7 +437,7 @@ func TestKubernetesParse(t *testing.T) { ...@@ -436,7 +437,7 @@ func TestKubernetesParse(t *testing.T) {
} }
} }
// Pods // Pods
foundPodMode := k8sController.PodMode foundPodMode := k8sController.podMode
if foundPodMode != test.expectedPodMode { if foundPodMode != test.expectedPodMode {
t.Errorf("Test %d: Expected kubernetes controller to be initialized with pod mode '%s'. Instead found pod mode '%s' for input '%s'", i, test.expectedPodMode, foundPodMode, test.input) t.Errorf("Test %d: Expected kubernetes controller to be initialized with pod mode '%s'. Instead found pod mode '%s' for input '%s'", i, test.expectedPodMode, foundPodMode, test.input)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment