From 65efeee64f772e0f38037e91a677138a335a7570 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Fri, 8 Dec 2017 16:03:56 +0800 Subject: [PATCH] Remove unused ScrubDNS interface from cloudprovider --- pkg/cloudprovider/cloud.go | 2 -- pkg/cloudprovider/providers/aws/aws.go | 5 --- pkg/cloudprovider/providers/azure/azure.go | 5 --- .../providers/cloudstack/cloudstack.go | 5 --- pkg/cloudprovider/providers/fake/fake.go | 5 --- pkg/cloudprovider/providers/gce/gce.go | 15 -------- pkg/cloudprovider/providers/gce/gce_test.go | 36 ------------------- .../providers/openstack/openstack.go | 5 --- pkg/cloudprovider/providers/ovirt/ovirt.go | 5 --- pkg/cloudprovider/providers/photon/photon.go | 5 --- .../providers/vsphere/vsphere.go | 5 --- 11 files changed, 93 deletions(-) diff --git a/pkg/cloudprovider/cloud.go b/pkg/cloudprovider/cloud.go index 2e46d47d339..2f5cbbf1a1a 100644 --- a/pkg/cloudprovider/cloud.go +++ b/pkg/cloudprovider/cloud.go @@ -44,8 +44,6 @@ type Interface interface { Routes() (Routes, bool) // ProviderName returns the cloud provider ID. ProviderName() string - // ScrubDNS provides an opportunity for cloud-provider-specific code to process DNS settings for pods. - ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) // HasClusterID returns true if a ClusterID is required and set HasClusterID() bool } diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index ad55f5383d7..41a4a4b5041 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -1135,11 +1135,6 @@ func (c *Cloud) ProviderName() string { return ProviderName } -// ScrubDNS filters DNS settings for pods. -func (c *Cloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // LoadBalancer returns an implementation of LoadBalancer for Amazon Web Services. func (c *Cloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) { return c, true diff --git a/pkg/cloudprovider/providers/azure/azure.go b/pkg/cloudprovider/providers/azure/azure.go index ffc2030a8fa..d60e11423f8 100644 --- a/pkg/cloudprovider/providers/azure/azure.go +++ b/pkg/cloudprovider/providers/azure/azure.go @@ -489,11 +489,6 @@ func (az *Cloud) Routes() (cloudprovider.Routes, bool) { return az, true } -// ScrubDNS provides an opportunity for cloud-provider-specific code to process DNS settings for pods. -func (az *Cloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (az *Cloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/cloudstack/cloudstack.go b/pkg/cloudprovider/providers/cloudstack/cloudstack.go index e4979a75c42..89d2c1f01f2 100644 --- a/pkg/cloudprovider/providers/cloudstack/cloudstack.go +++ b/pkg/cloudprovider/providers/cloudstack/cloudstack.go @@ -181,11 +181,6 @@ func (cs *CSCloud) ProviderName() string { return ProviderName } -// ScrubDNS filters DNS settings for pods. -func (cs *CSCloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (cs *CSCloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/fake/fake.go b/pkg/cloudprovider/providers/fake/fake.go index 5efc09a11bf..d040c51df65 100644 --- a/pkg/cloudprovider/providers/fake/fake.go +++ b/pkg/cloudprovider/providers/fake/fake.go @@ -110,11 +110,6 @@ func (f *FakeCloud) ProviderName() string { return f.Provider } -// ScrubDNS filters DNS settings for pods. -func (f *FakeCloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (f *FakeCloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 8447092f164..95d4f33afb5 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -20,7 +20,6 @@ import ( "fmt" "io" "net/http" - "regexp" "runtime" "strconv" "strings" @@ -667,20 +666,6 @@ func (gce *GCECloud) updateNodeZones(prevNode, newNode *v1.Node) { } } -// Known-useless DNS search path. -var uselessDNSSearchRE = regexp.MustCompile(`^[0-9]+.google.internal.$`) - -// ScrubDNS filters DNS settings for pods. -func (gce *GCECloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - // GCE has too many search paths by default. Filter the ones we know are useless. - for _, s := range searches { - if !uselessDNSSearchRE.MatchString(s) { - srchOut = append(srchOut, s) - } - } - return nameservers, srchOut -} - // HasClusterID returns true if the cluster has a clusterID func (gce *GCECloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/gce/gce_test.go b/pkg/cloudprovider/providers/gce/gce_test.go index e3020acb7db..d4201b54bd4 100644 --- a/pkg/cloudprovider/providers/gce/gce_test.go +++ b/pkg/cloudprovider/providers/gce/gce_test.go @@ -175,42 +175,6 @@ func TestComparingHostURLs(t *testing.T) { } } -func TestScrubDNS(t *testing.T) { - tcs := []struct { - nameserversIn []string - searchesIn []string - nameserversOut []string - searchesOut []string - }{ - { - nameserversIn: []string{"1.2.3.4", "5.6.7.8"}, - nameserversOut: []string{"1.2.3.4", "5.6.7.8"}, - }, - { - searchesIn: []string{"c.prj.internal.", "12345678910.google.internal.", "google.internal."}, - searchesOut: []string{"c.prj.internal.", "google.internal."}, - }, - { - searchesIn: []string{"c.prj.internal.", "12345678910.google.internal.", "zone.c.prj.internal.", "google.internal."}, - searchesOut: []string{"c.prj.internal.", "zone.c.prj.internal.", "google.internal."}, - }, - { - searchesIn: []string{"c.prj.internal.", "12345678910.google.internal.", "zone.c.prj.internal.", "google.internal.", "unexpected"}, - searchesOut: []string{"c.prj.internal.", "zone.c.prj.internal.", "google.internal.", "unexpected"}, - }, - } - gce := &GCECloud{} - for i := range tcs { - n, s := gce.ScrubDNS(tcs[i].nameserversIn, tcs[i].searchesIn) - if !reflect.DeepEqual(n, tcs[i].nameserversOut) { - t.Errorf("Expected %v, got %v", tcs[i].nameserversOut, n) - } - if !reflect.DeepEqual(s, tcs[i].searchesOut) { - t.Errorf("Expected %v, got %v", tcs[i].searchesOut, s) - } - } -} - func TestSplitProviderID(t *testing.T) { providers := []struct { providerID string diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index a2a517a4d3e..00e15d228b2 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -486,11 +486,6 @@ func (os *OpenStack) ProviderName() string { return ProviderName } -// ScrubDNS filters DNS settings for pods. -func (os *OpenStack) ScrubDNS(nameServers, searches []string) ([]string, []string) { - return nameServers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (os *OpenStack) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/ovirt/ovirt.go b/pkg/cloudprovider/providers/ovirt/ovirt.go index e688257ad87..eaade007074 100644 --- a/pkg/cloudprovider/providers/ovirt/ovirt.go +++ b/pkg/cloudprovider/providers/ovirt/ovirt.go @@ -128,11 +128,6 @@ func (v *OVirtCloud) ProviderName() string { return ProviderName } -// ScrubDNS filters DNS settings for pods. -func (v *OVirtCloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (v *OVirtCloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/photon/photon.go b/pkg/cloudprovider/providers/photon/photon.go index 5071de5c531..d2e8c2d780a 100644 --- a/pkg/cloudprovider/providers/photon/photon.go +++ b/pkg/cloudprovider/providers/photon/photon.go @@ -546,11 +546,6 @@ func (pc *PCCloud) Routes() (cloudprovider.Routes, bool) { return nil, false } -// ScrubDNS filters DNS settings for pods. -func (pc *PCCloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // HasClusterID returns true if the cluster has a clusterID func (pc *PCCloud) HasClusterID() bool { return true diff --git a/pkg/cloudprovider/providers/vsphere/vsphere.go b/pkg/cloudprovider/providers/vsphere/vsphere.go index 77f80e23549..5d4577be32f 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere.go @@ -689,11 +689,6 @@ func (vs *VSphere) Routes() (cloudprovider.Routes, bool) { return nil, false } -// ScrubDNS filters DNS settings for pods. -func (vs *VSphere) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { - return nameservers, searches -} - // AttachDisk attaches given virtual disk volume to the compute running kubelet. func (vs *VSphere) AttachDisk(vmDiskPath string, storagePolicyName string, nodeName k8stypes.NodeName) (diskUUID string, err error) { attachDiskInternal := func(vmDiskPath string, storagePolicyName string, nodeName k8stypes.NodeName) (diskUUID string, err error) {