From 4fed1971f6f263bd4c4572ce3a56a3a447bdc35e Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Fri, 14 Jul 2017 14:43:50 -0500 Subject: [PATCH] no warning event on dns search deduplication --- pkg/kubelet/kubelet_network.go | 4 ---- pkg/kubelet/kubelet_network_test.go | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index 4e1a971bae5..3fc6d0c52d8 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -95,10 +95,6 @@ func omitDuplicates(kl *Kubelet, pod *v1.Pod, combinedSearch []string) []string if _, exists := uniqueDomains[dnsDomain]; !exists { combinedSearch[len(uniqueDomains)] = dnsDomain uniqueDomains[dnsDomain] = true - } else { - log := fmt.Sprintf("Found and omitted duplicated dns domain in host search line: '%s' during merging with cluster dns domains", dnsDomain) - kl.recorder.Event(pod, v1.EventTypeWarning, "DNSSearchForming", log) - glog.Error(log) } } return combinedSearch[:len(uniqueDomains)] diff --git a/pkg/kubelet/kubelet_network_test.go b/pkg/kubelet/kubelet_network_test.go index 5de1c582eda..0e8e6994c00 100644 --- a/pkg/kubelet/kubelet_network_test.go +++ b/pkg/kubelet/kubelet_network_test.go @@ -138,10 +138,7 @@ func TestComposeDNSSearch(t *testing.T) { []string{"testNS.svc.TEST", "svc.TEST", "TEST"}, []string{"AAA", "svc.TEST", "BBB", "TEST"}, []string{"testNS.svc.TEST", "svc.TEST", "TEST", "AAA", "BBB"}, - []string{ - "Found and omitted duplicated dns domain in host search line: 'svc.TEST' during merging with cluster dns domains", - "Found and omitted duplicated dns domain in host search line: 'TEST' during merging with cluster dns domains", - }, + []string{}, }, { @@ -156,8 +153,6 @@ func TestComposeDNSSearch(t *testing.T) { []string{"AAA", "TEST", "BBB", "TEST", "CCC", "DDD"}, []string{"testNS.svc.TEST", "svc.TEST", "TEST", "AAA", "BBB", "CCC"}, []string{ - "Found and omitted duplicated dns domain in host search line: 'TEST' during merging with cluster dns domains", - "Found and omitted duplicated dns domain in host search line: 'TEST' during merging with cluster dns domains", "Search Line limits were exceeded, some dns names have been omitted, the applied search line is: testNS.svc.TEST svc.TEST TEST AAA BBB CCC", }, },