Fix incorrect internalLB deletion name (#173)

johnharris85 · k8s-ci-robot · commit b741bfc1833b · 2019-04-04T12:01:19.000-07:00
Signed-off-by: John Harris &lt;joharris@vmware.com&gt;
diff --git a/pkg/cloud/azure/actuators/cluster/reconciler.go b/pkg/cloud/azure/actuators/cluster/reconciler.go
@@ -213,11 +213,11 @@ func (s *Reconciler) deleteLB() error {
 	}
 
 	internalLBSpec := &internalloadbalancers.Spec{
-		Name: azure.GenerateNodeSubnetName(s.scope.Cluster.Name),
+		Name: azure.GenerateInternalLBName(s.scope.Cluster.Name),
 	}
 	if err := s.internalLBSvc.Delete(s.scope.Context, internalLBSpec); err != nil {
 		if !azure.ResourceNotFound(err) {
-			return errors.Wrapf(err, "failed to internal load balancer %s for cluster %s", azure.GenerateNodeSubnetName(s.scope.Cluster.Name), s.scope.Cluster.Name)
+			return errors.Wrapf(err, "failed to internal load balancer %s for cluster %s", azure.GenerateInternalLBName(s.scope.Cluster.Name), s.scope.Cluster.Name)
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,11 @@ func (s *Reconciler) deleteLB() error {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`internalLBSpec := &internalloadbalancers.Spec{`
`216`		`- Name: azure.GenerateNodeSubnetName(s.scope.Cluster.Name),`
	`216`	`+ Name: azure.GenerateInternalLBName(s.scope.Cluster.Name),`
`217`	`217`	`}`
`218`	`218`	`if err := s.internalLBSvc.Delete(s.scope.Context, internalLBSpec); err != nil {`
`219`	`219`	`if !azure.ResourceNotFound(err) {`
`220`		`- return errors.Wrapf(err, "failed to internal load balancer %s for cluster %s", azure.GenerateNodeSubnetName(s.scope.Cluster.Name), s.scope.Cluster.Name)`
	`220`	`+ return errors.Wrapf(err, "failed to internal load balancer %s for cluster %s", azure.GenerateInternalLBName(s.scope.Cluster.Name), s.scope.Cluster.Name)`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`return nil`