Merge pull request #2327 from spectrocloud/vpc-delete-failure

🐛fix for vpc deletion failure
kubernetes-sigs · Mar 30, 2021 · 76d4b0f · 76d4b0f
2 parents 46f54e4 + 6a10032
commit 76d4b0f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/cloud/services/securitygroup/securitygroups.go b/pkg/cloud/services/securitygroup/securitygroups.go
@@ -263,6 +263,12 @@ func (s *Service) ec2SecurityGroupToSecurityGroup(ec2SecurityGroup *ec2.Security
 
 func (s *Service) DeleteSecurityGroups() error {
 	conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "")
+	if s.scope.VPC().ID == "" {
+		s.scope.V(2).Info("Skipping security group deletion, vpc-id is nil", "vpc-id", s.scope.VPC().ID)
+		conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletedReason, clusterv1.ConditionSeverityInfo, "")
+		return nil
+	}
+
 	if err := s.scope.PatchObject(); err != nil {
 		return err
 	}