diff options
author | 2018-01-24 23:44:18 +0300 | |
---|---|---|
committer | 2018-01-24 20:44:18 +0000 | |
commit | 1e75061aec43689586986bc08f2e6a1c074418c3 (patch) | |
tree | ec06af9a698a733ece07848d070b6fbe15e31b7b /plugin/kubernetes/controller.go | |
parent | a0ad2ff0af39303c79db248aa11d73008c4791d9 (diff) | |
download | coredns-1e75061aec43689586986bc08f2e6a1c074418c3.tar.gz coredns-1e75061aec43689586986bc08f2e6a1c074418c3.tar.zst coredns-1e75061aec43689586986bc08f2e6a1c074418c3.zip |
Remove pointers to labels.Selector and pass normally instead (#1422)
Diffstat (limited to 'plugin/kubernetes/controller.go')
-rw-r--r-- | plugin/kubernetes/controller.go | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plugin/kubernetes/controller.go b/plugin/kubernetes/controller.go index 536f65f32..00b0c11ac 100644 --- a/plugin/kubernetes/controller.go +++ b/plugin/kubernetes/controller.go @@ -46,7 +46,7 @@ type dnsController interface { type dnsControl struct { client *kubernetes.Clientset - selector *labels.Selector + selector labels.Selector svcController cache.Controller podController cache.Controller @@ -69,7 +69,7 @@ type dnsControlOpts struct { resyncPeriod time.Duration // Label handling. labelSelector *meta.LabelSelector - selector *labels.Selector + selector labels.Selector } // newDNSController creates a controller for CoreDNS. @@ -159,10 +159,10 @@ func epIPIndexFunc(obj interface{}) ([]string, error) { return idx, nil } -func serviceListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(meta.ListOptions) (runtime.Object, error) { +func serviceListFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { return func(opts meta.ListOptions) (runtime.Object, error) { if s != nil { - opts.LabelSelector = (*s).String() + opts.LabelSelector = s.String() } listV1, err := c.CoreV1().Services(ns).List(opts) if err != nil { @@ -172,10 +172,10 @@ func serviceListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) fun } } -func podListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(meta.ListOptions) (runtime.Object, error) { +func podListFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { return func(opts meta.ListOptions) (runtime.Object, error) { if s != nil { - opts.LabelSelector = (*s).String() + opts.LabelSelector = s.String() } listV1, err := c.CoreV1().Pods(ns).List(opts) if err != nil { @@ -185,10 +185,10 @@ func podListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(me } } -func serviceWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { +func serviceWatchFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { return func(options meta.ListOptions) (watch.Interface, error) { if s != nil { - options.LabelSelector = (*s).String() + options.LabelSelector = s.String() } w, err := c.CoreV1().Services(ns).Watch(options) if err != nil { @@ -198,10 +198,10 @@ func serviceWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) fu } } -func podWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { +func podWatchFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { return func(options meta.ListOptions) (watch.Interface, error) { if s != nil { - options.LabelSelector = (*s).String() + options.LabelSelector = s.String() } w, err := c.CoreV1().Pods(ns).Watch(options) if err != nil { @@ -211,10 +211,10 @@ func podWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(o } } -func endpointsListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(meta.ListOptions) (runtime.Object, error) { +func endpointsListFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { return func(opts meta.ListOptions) (runtime.Object, error) { if s != nil { - opts.LabelSelector = (*s).String() + opts.LabelSelector = s.String() } listV1, err := c.CoreV1().Endpoints(ns).List(opts) if err != nil { @@ -224,10 +224,10 @@ func endpointsListFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) f } } -func endpointsWatchFunc(c *kubernetes.Clientset, ns string, s *labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { +func endpointsWatchFunc(c *kubernetes.Clientset, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { return func(options meta.ListOptions) (watch.Interface, error) { if s != nil { - options.LabelSelector = (*s).String() + options.LabelSelector = s.String() } w, err := c.CoreV1().Endpoints(ns).Watch(options) if err != nil { |