From 12db6618c82c6e6687c8610edfb1c0a0e352ced3 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Tue, 22 Aug 2017 21:52:18 +0100 Subject: mw/kubernetes: resync to opts (#957) * mw/kubernetes: resync to opts Only used to initialize the cache that already has a dnsControlopts, so remove it from the main kubernetes struct. * Fix test * mw/kubernetes: LabelSelector to options as well Labels select is also only used for init. Don't carry it in the main kubernetes struct. * remove this test: can't happen Caddyfile parser will only call setup when it sees kubernetes. * erge gone wrong --- middleware/kubernetes/setup_test.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'middleware/kubernetes/setup_test.go') diff --git a/middleware/kubernetes/setup_test.go b/middleware/kubernetes/setup_test.go index 09a617e42..7f9e78b85 100644 --- a/middleware/kubernetes/setup_test.go +++ b/middleware/kubernetes/setup_test.go @@ -176,19 +176,6 @@ func TestKubernetesParse(t *testing.T) { true, nil, }, - // negative - { - "", - true, - "kubernetes setup called without keyword 'kubernetes' in Corefile", - -1, - -1, - defaultResyncPeriod, - "", - PodModeDisabled, - false, - nil, - }, { `kubernetes coredns.local { endpoint @@ -396,7 +383,7 @@ func TestKubernetesParse(t *testing.T) { for i, test := range tests { c := caddy.NewTestController("dns", test.input) - k8sController, err := kubernetesParse(c) + k8sController, opts, err := kubernetesParse(c) if test.shouldErr && err == nil { t.Errorf("Test %d: Expected error, but did not find error for input '%s'. Error was: '%v'", i, test.input, err) @@ -436,14 +423,14 @@ func TestKubernetesParse(t *testing.T) { } // ResyncPeriod - foundResyncPeriod := k8sController.ResyncPeriod + foundResyncPeriod := opts.resyncPeriod if foundResyncPeriod != test.expectedResyncPeriod { t.Errorf("Test %d: Expected kubernetes controller to be initialized with resync period '%s'. Instead found period '%s' for input '%s'", i, test.expectedResyncPeriod, foundResyncPeriod, test.input) } // Labels - if k8sController.LabelSelector != nil { - foundLabelSelectorString := unversioned.FormatLabelSelector(k8sController.LabelSelector) + if opts.labelSelector != nil { + foundLabelSelectorString := unversioned.FormatLabelSelector(opts.labelSelector) if foundLabelSelectorString != test.expectedLabelSelector { t.Errorf("Test %d: Expected kubernetes controller to be initialized with label selector '%s'. Instead found selector '%s' for input '%s'", i, test.expectedLabelSelector, foundLabelSelectorString, test.input) } -- cgit v1.2.3