Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/kubernetes: smaller map (#2383)

Browse Source 
* 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>
This commit is contained in:
Miek Gieben
2018-12-08 23:40:07 +00:00
committed by Yong Tang
parent 0f7d95b1e7
commit 95546dfdfe
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/kubernetes/handler_test.go
View File

@@ -348,7 +348,7 @@ func TestServeDNS(t *testing.T) {
k := New([]string{"cluster.local."}) k := New([]string{"cluster.local."})
k.APIConn = &APIConnServeTest{} k.APIConn = &APIConnServeTest{}
k.Next = test.NextHandler(dns.RcodeSuccess, nil) k.Next = test.NextHandler(dns.RcodeSuccess, nil)
k.Namespaces = map[string]bool{"testns": true} k.Namespaces = map[string]struct{}{"testns": struct{}{}}
ctx := context.TODO() ctx := context.TODO()
for i, tc := range dnsTestCases { for i, tc := range dnsTestCases {
@@ -395,7 +395,7 @@ func TestNotSyncedServeDNS(t *testing.T) {
notSynced: true, notSynced: true,
} }
k.Next = test.NextHandler(dns.RcodeSuccess, nil) k.Next = test.NextHandler(dns.RcodeSuccess, nil)
k.Namespaces = map[string]bool{"testns": true} k.Namespaces = map[string]struct{}{"testns": struct{}{}}
ctx := context.TODO() ctx := context.TODO()
for i, tc := range notSyncedTestCases { for i, tc := range notSyncedTestCases {

4
plugin/kubernetes/kubernetes.go
View File

@@ -40,7 +40,7 @@ type Kubernetes struct {
APIClientKey string APIClientKey string
ClientConfig clientcmd.ClientConfig ClientConfig clientcmd.ClientConfig
APIConn dnsController APIConn dnsController
Namespaces map[string]bool Namespaces map[string]struct{}
podMode string podMode string
endpointNameMode bool endpointNameMode bool
Fall fall.F Fall fall.F
@@ -58,7 +58,7 @@ type Kubernetes struct {
func New(zones []string) *Kubernetes { func New(zones []string) *Kubernetes {
k := new(Kubernetes) k := new(Kubernetes)
k.Zones = zones 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.interfaceAddrsFunc = func() net.IP { return net.ParseIP("127.0.0.1") }
k.podMode = podModeDisabled k.podMode = podModeDisabled
k.ttl = defaultTTL k.ttl = defaultTTL

2
plugin/kubernetes/setup.go
View File

@@ -187,7 +187,7 @@ func ParseStanza(c *caddy.Controller) (*Kubernetes, error) {
args := c.RemainingArgs() args := c.RemainingArgs()
if len(args) > 0 { if len(args) > 0 {
for _, a := range args { for _, a := range args {
k8s.Namespaces[a] = true k8s.Namespaces[a] = struct{}{}
} }
continue continue
} }

4
plugin/kubernetes/xfr_test.go
View File

@@ -16,7 +16,7 @@ func TestKubernetesXFR(t *testing.T) {
k := New([]string{"cluster.local."}) k := New([]string{"cluster.local."})
k.APIConn = &APIConnServeTest{} k.APIConn = &APIConnServeTest{}
k.TransferTo = []string{"10.240.0.1:53"} 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() ctx := context.TODO()
w := dnstest.NewMultiRecorder(&test.ResponseWriter{}) w := dnstest.NewMultiRecorder(&test.ResponseWriter{})
@@ -104,7 +104,7 @@ func TestKubernetesXFRNotAllowed(t *testing.T) {
k := New([]string{"cluster.local."}) k := New([]string{"cluster.local."})
k.APIConn = &APIConnServeTest{} k.APIConn = &APIConnServeTest{}
k.TransferTo = []string{"1.2.3.4:53"} 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() ctx := context.TODO()
w := dnstest.NewMultiRecorder(&test.ResponseWriter{}) w := dnstest.NewMultiRecorder(&test.ResponseWriter{})