Address review comments

eksctl-io · Jul 10, 2019 · ea086cc · ea086cc
1 parent ff11798
commit ea086cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pkg/ctl/delete/cluster.go b/pkg/ctl/delete/cluster.go
@@ -113,7 +113,7 @@ func doDeleteCluster(rc *cmdutils.ResourceCmd) error {
 		if err != nil {
 			return err
 		}
-		elb.CleanupLoadBalancers(ctl.Provider.ELB(), ctl.Provider.ELBV2(), client)
+		elb.Cleanup(ctl.Provider.ELB(), ctl.Provider.ELBV2(), client)
 
 		tasks, err := stackManager.NewTasksToDeleteClusterWithNodeGroups(rc.Wait, func(errs chan error, _ string) error {
 			logger.Info("trying to cleanup dangling network interfaces")

diff --git a/pkg/elb/cleanup.go b/pkg/elb/cleanup.go
@@ -24,13 +24,13 @@ const (
 	elbV2      = iota
 )
 
-// CleanupLoadBalancers finds and deletes any dangling ELBs attached to a service
-func CleanupLoadBalancers(elbapi elbiface.ELBAPI, elbv2api elbv2iface.ELBV2API, client *eks.Client) error {
+// Cleanup finds and deletes any dangling ELBs associted to a Kubernetes Service
+func Cleanup(elbapi elbiface.ELBAPI, elbv2api elbv2iface.ELBV2API, client *eks.Client) error {
 	kubernetesCS, err := client.NewClientSet()
 	if err != nil {
 		return err
 	}
-	services, err := kubernetesCS.CoreV1().Services("").List(metav1.ListOptions{})
+	services, err := kubernetesCS.CoreV1().Services(metav1.NamespaceAll).List(metav1.ListOptions{})
 	if err != nil {
 		return err
 	}

diff --git a/pkg/vpc/cleanup.go b/pkg/vpc/cleanup.go
@@ -79,4 +79,3 @@ func CleanupNetworkInterfaces(ec2API ec2iface.EC2API, spec *api.ClusterConfig) e
 	}
 	return nil
 }
-