Merge pull request #1453 from aaroniscode/vpc_delete

🐛 Fix deleting AWSCluster when VPC doesn't exist

Author: k8s-ci-robot

pkg/cloud/services/ec2/network.go

@@ -16,6 +16,10 @@ limitations under the License.
 
 package ec2
 
+import (
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/awserrors"
+)
+
 // ReconcileNetwork reconciles the network of the given cluster.
 func (s *Service) ReconcileNetwork() (err error) {
 	s.scope.V(2).Info("Reconciling network for cluster", "cluster-name", s.scope.Cluster.Name, "cluster-namespace", s.scope.Cluster.Namespace)
@@ -58,6 +62,17 @@ func (s *Service) ReconcileNetwork() (err error) {
 func (s *Service) DeleteNetwork() (err error) {
 	s.scope.V(2).Info("Deleting network")
 
+	// Search for a previously created and tagged VPC
+	vpc, err := s.describeVPC()
+	if err != nil {
+		if awserrors.IsNotFound(err) {
+			// If the VPC does not exist, nothing to do
+			return nil
+		}
+		return err
+	}
+	vpc.DeepCopyInto(s.scope.VPC())
+
 	// Security groups.
 	if err := s.deleteSecurityGroups(); err != nil {
 		return err

pkg/cloud/services/ec2/vpc.go

@@ -207,15 +207,6 @@ func (s *Service) deleteVPC() error {
 		return nil
 	}
 
-	vpc, err := s.describeVPC()
-	if err != nil {
-		if awserrors.IsNotFound(err) {
-			// If the VPC does not exist, nothing to do
-			return nil
-		}
-		return err
-	}
-
 	input := &ec2.DeleteVpcInput{
 		VpcId: aws.String(vpc.ID),
 	}