diff options
| author |  Miek Gieben <miek@miek.nl>
| 2018-12-08 23:40:07 +0000 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2018-12-08 15:40:07 -0800 |
| commit | 95546dfdfeab92149a99734120386ff994bfd639 (patch) | |
| tree | 8a5faa9d9d149a685b3a7625bc63006f22fa2f6a /plugin | |
| parent | 0f7d95b1e7466512c1bee194d3601d4852a966e9 (diff) | |
| download | coredns-95546dfdfeab92149a99734120386ff994bfd639.tar.gz coredns-95546dfdfeab92149a99734120386ff994bfd639.tar.zst coredns-95546dfdfeab92149a99734120386ff994bfd639.zip | |
plugin/kubernetes: smaller map (#2383)
* plugin/kubernetes: smaller map
to continue with a theme: the map[string]bool can be reduced
to map[string]struct{} to reduce a tiny amount of memory.
Signed-off-by: Miek Gieben <miek@miek.nl>
* fix tests
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/kubernetes/handler_test.go | 4 | ||||
| -rw-r--r-- | plugin/kubernetes/kubernetes.go | 4 | ||||
| -rw-r--r-- | plugin/kubernetes/setup.go | 2 | ||||
| -rw-r--r-- | plugin/kubernetes/xfr_test.go | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/plugin/kubernetes/handler_test.go b/plugin/kubernetes/handler_test.go index 3efdbe031..aa9b35e1a 100644 --- a/plugin/kubernetes/handler_test.go +++ b/plugin/kubernetes/handler_test.go @@ -348,7 +348,7 @@ func TestServeDNS(t *testing.T) { k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.Next = test.NextHandler(dns.RcodeSuccess, nil) - k.Namespaces = map[string]bool{"testns": true} + k.Namespaces = map[string]struct{}{"testns": struct{}{}} ctx := context.TODO() for i, tc := range dnsTestCases { @@ -395,7 +395,7 @@ func TestNotSyncedServeDNS(t *testing.T) { notSynced: true, } k.Next = test.NextHandler(dns.RcodeSuccess, nil) - k.Namespaces = map[string]bool{"testns": true} + k.Namespaces = map[string]struct{}{"testns": struct{}{}} ctx := context.TODO() for i, tc := range notSyncedTestCases { diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index 0e15100cb..304972af3 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -40,7 +40,7 @@ type Kubernetes struct { APIClientKey string ClientConfig clientcmd.ClientConfig APIConn dnsController - Namespaces map[string]bool + Namespaces map[string]struct{} podMode string endpointNameMode bool Fall fall.F @@ -58,7 +58,7 @@ type Kubernetes struct { func New(zones []string) *Kubernetes { k := new(Kubernetes) k.Zones = zones - k.Namespaces = make(map[string]bool) + k.Namespaces = make(map[string]struct{}) k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("127.0.0.1") } k.podMode = podModeDisabled k.ttl = defaultTTL diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go index f3b554197..6928580ba 100644 --- a/plugin/kubernetes/setup.go +++ b/plugin/kubernetes/setup.go @@ -187,7 +187,7 @@ func ParseStanza(c *caddy.Controller) (*Kubernetes, error) { args := c.RemainingArgs() if len(args) > 0 { for _, a := range args { - k8s.Namespaces[a] = true + k8s.Namespaces[a] = struct{}{} } continue } diff --git a/plugin/kubernetes/xfr_test.go b/plugin/kubernetes/xfr_test.go index 78ad98208..dc6404c0c 100644 --- a/plugin/kubernetes/xfr_test.go +++ b/plugin/kubernetes/xfr_test.go @@ -16,7 +16,7 @@ func TestKubernetesXFR(t *testing.T) { k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.TransferTo = []string{"10.240.0.1:53"} - k.Namespaces = map[string]bool{"testns": true} + k.Namespaces = map[string]struct{}{"testns": struct{}{}} ctx := context.TODO() w := dnstest.NewMultiRecorder(&test.ResponseWriter{}) @@ -104,7 +104,7 @@ func TestKubernetesXFRNotAllowed(t *testing.T) { k := New([]string{"cluster.local."}) k.APIConn = &APIConnServeTest{} k.TransferTo = []string{"1.2.3.4:53"} - k.Namespaces = map[string]bool{"testns": true} + k.Namespaces = map[string]struct{}{"testns": struct{}{}} ctx := context.TODO() w := dnstest.NewMultiRecorder(&test.ResponseWriter{}) |