Merge pull request #3240 from Ankitasw/block-recreate-elb

Block ELB re-creation after the cluster has been provisioned

Author: k8s-ci-robot

pkg/cloud/scope/cluster.go

@@ -193,6 +193,10 @@ func (s *ClusterScope) ControlPlaneLoadBalancerName() *string {
 	return nil
 }
 
+func (s *ClusterScope) ControlPlaneEndpoint() clusterv1.APIEndpoint {
+	return s.AWSCluster.Spec.ControlPlaneEndpoint
+}
+
 // ControlPlaneConfigMapName returns the name of the ConfigMap used to
 // coordinate the bootstrapping of control plane nodes.
 func (s *ClusterScope) ControlPlaneConfigMapName() string {

pkg/cloud/scope/elb.go

@@ -19,6 +19,7 @@ package scope
 import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // ELBScope is a scope for use with the ELB reconciling service.
@@ -45,4 +46,7 @@ type ELBScope interface {
 
 	// ControlPlaneLoadBalancerName returns the Classic ELB name
 	ControlPlaneLoadBalancerName() *string
+
+	// ControlPlaneEndpoint returns AWSCluster control plane endpoint
+	ControlPlaneEndpoint() clusterv1.APIEndpoint
 }

pkg/cloud/services/elb/loadbalancer.go

@@ -77,14 +77,17 @@ func (s *Service) ReconcileLoadbalancers() error {
 	}
 
 	apiELB, err := s.describeClassicELB(spec.Name)
-	if IsNotFound(err) {
+	switch {
+	case IsNotFound(err) && s.scope.ControlPlaneEndpoint().IsValid():
+		// if elb is not found and owner cluster ControlPlaneEndpoint is already populated, then we should not recreate the elb.
+		return errors.Wrapf(err, "no loadbalancer exists for the AWSCluster %s, the cluster has become unrecoverable and should be deleted manually", s.scope.InfraClusterName())
+	case IsNotFound(err):
 		apiELB, err = s.createClassicELB(spec)
 		if err != nil {
 			return err
 		}
-
 		s.scope.V(2).Info("Created new classic load balancer for apiserver", "api-server-elb-name", apiELB.Name)
-	} else if err != nil {
+	case err != nil:
 		// Failed to describe the classic ELB
 		return err
 	}