From 3fc0c05d830465f47eb6c534e19863a6cb15109f Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 8 May 2017 20:09:54 -0700 Subject: [PATCH] azure: instances: remove dead code --- pkg/cloudprovider/providers/azure/BUILD | 1 - .../providers/azure/azure_instances.go | 19 ---------------- .../providers/azure/azure_test.go | 22 ------------------- 3 files changed, 42 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/BUILD b/pkg/cloudprovider/providers/azure/BUILD index 28f4874aa0..5192a8b5e9 100644 --- a/pkg/cloudprovider/providers/azure/BUILD +++ b/pkg/cloudprovider/providers/azure/BUILD @@ -54,7 +54,6 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/api/v1/service:go_default_library", - "//vendor/github.com/Azure/azure-sdk-for-go/arm/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/arm/network:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/cloudprovider/providers/azure/azure_instances.go b/pkg/cloudprovider/providers/azure/azure_instances.go index cf948ff9db..45b109e147 100644 --- a/pkg/cloudprovider/providers/azure/azure_instances.go +++ b/pkg/cloudprovider/providers/azure/azure_instances.go @@ -19,7 +19,6 @@ package azure import ( "errors" "fmt" - "regexp" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" @@ -123,24 +122,6 @@ func (az *Cloud) listAllNodesInResourceGroup() ([]compute.VirtualMachine, error) } -func filterNodes(nodes []compute.VirtualMachine, filter string) ([]compute.VirtualMachine, error) { - filteredNodes := []compute.VirtualMachine{} - - re, err := regexp.Compile(filter) - if err != nil { - return nil, err - } - - for _, node := range nodes { - // search tags - if re.MatchString(*node.Name) { - filteredNodes = append(filteredNodes, node) - } - } - - return filteredNodes, nil -} - // mapNodeNameToVMName maps a k8s NodeName to an Azure VM Name // This is a simple string cast. func mapNodeNameToVMName(nodeName types.NodeName) string { diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/pkg/cloudprovider/providers/azure/azure_test.go index a0718068aa..eb1ce13a09 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/pkg/cloudprovider/providers/azure/azure_test.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/v1" serviceapi "k8s.io/kubernetes/pkg/api/v1/service" - "github.com/Azure/azure-sdk-for-go/arm/compute" "github.com/Azure/azure-sdk-for-go/arm/network" "github.com/Azure/go-autorest/autorest/to" ) @@ -680,24 +679,3 @@ func TestDecodeInstanceInfo(t *testing.T) { t.Error("got incorrect fault domain") } } - -func TestFilterNodes(t *testing.T) { - nodes := []compute.VirtualMachine{ - {Name: to.StringPtr("test")}, - {Name: to.StringPtr("test2")}, - {Name: to.StringPtr("3test")}, - } - - filteredNodes, err := filterNodes(nodes, "^test$") - if err != nil { - t.Errorf("Unexpeted error when filtering: %q", err) - } - - if len(filteredNodes) != 1 { - t.Error("Got too many nodes after filtering") - } - - if *filteredNodes[0].Name != "test" { - t.Error("Get the wrong node after filtering") - } -}