Skip to content

Commit

Permalink
Merge pull request #3157 from richardchen331/fix_change_condition_con…
Browse files Browse the repository at this point in the history
…flict_in_deleteReconcile

Fix change condition conflict in reconcileDelete
  • Loading branch information
k8s-ci-robot committed Mar 2, 2022
2 parents 54f8c19 + 95c2dc2 commit 0eee277
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions pkg/cloud/services/securitygroup/securitygroups.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,19 +252,24 @@ func (s *Service) ec2SecurityGroupToSecurityGroup(ec2SecurityGroup *ec2.Security

// DeleteSecurityGroups will delete a service's security groups.
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 {
clusterGroups, err := s.describeClusterOwnedSecurityGroups()
if err != nil {
return err
}

clusterGroups, err := s.describeClusterOwnedSecurityGroups()
if err != nil {
// Security groups already deleted, exit early
if len(clusterGroups) == 0 {
return nil
}

conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "")
if err := s.scope.PatchObject(); err != nil {
return err
}

Expand Down

0 comments on commit 0eee277

Please sign in to comment.