Skip to content

Commit 4010b3b

Browse files
committed
Fix SG deletion logic on Default VPC
1 parent 47820e4 commit 4010b3b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/cloud/services/securitygroup/securitygroups.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ func (s *Service) ReconcileSecurityGroups() error {
160160
// skip rule reconciliation, as we expect the in-cluster cloud integration to manage them
161161
continue
162162
}
163+
if sg.Name == "default" {
164+
// skip rule reconciliation, as default SG group is already handled by revokeIngressAndEgressRulesFromVPCDefaultSecurityGroup
165+
continue
166+
}
163167
current := sg.IngressRules
164168

165169
specRules, err := s.getSecurityGroupIngressRules(role)
@@ -516,8 +520,8 @@ func (s *Service) revokeSecurityGroupIngressRules(id string, rules infrav1.Ingre
516520
rule := rules[i]
517521
input.IpPermissions = append(input.IpPermissions, *ingressRuleToSDKType(s.scope, &rule))
518522
}
519-
520-
if _, err := s.EC2Client.RevokeSecurityGroupIngress(context.TODO(), input); err != nil && !awserrors.IsPermissionNotFoundError(errors.Cause(err)) {
523+
_, err := s.EC2Client.RevokeSecurityGroupIngress(context.TODO(), input)
524+
if err != nil && !awserrors.IsPermissionNotFoundError(errors.Cause(err)) {
521525
record.Warnf(s.scope.InfraCluster(), "FailedRevokeSecurityGroupIngressRules", "Failed to revoke security group ingress rules %v for SecurityGroup %q: %v", rules, id, err)
522526
return errors.Wrapf(err, "failed to revoke security group %q ingress rules: %v", id, rules)
523527
}

0 commit comments

Comments
 (0)