From 295334c4ecc926257c685add4f7fce0e10cfe920 Mon Sep 17 00:00:00 2001 From: LochanRn Date: Tue, 23 Mar 2021 22:19:34 +0530 Subject: [PATCH 1/4] fixed vpc deletion failure --- pkg/cloud/services/securitygroup/securitygroups.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cloud/services/securitygroup/securitygroups.go b/pkg/cloud/services/securitygroup/securitygroups.go index a0ffb9c7df..8c9dbbca6c 100644 --- a/pkg/cloud/services/securitygroup/securitygroups.go +++ b/pkg/cloud/services/securitygroup/securitygroups.go @@ -194,6 +194,11 @@ func (s *Service) DeleteSecurityGroups() error { } } + if s.scope.VPC().ID == "" { + s.scope.V(0).Info("skipping cluster owned security group delete, vpc id nil", "vpc-id", s.scope.VPC().ID) + return nil + } + clusterGroups, err := s.describeClusterOwnedSecurityGroups() if err != nil { return err From d1f5af6625c3a5b678236194478fe16149338993 Mon Sep 17 00:00:00 2001 From: LochanRn Date: Wed, 24 Mar 2021 15:17:44 +0530 Subject: [PATCH 2/4] minor changes --- pkg/cloud/services/securitygroup/securitygroups.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/cloud/services/securitygroup/securitygroups.go b/pkg/cloud/services/securitygroup/securitygroups.go index 8c9dbbca6c..fcbe74179b 100644 --- a/pkg/cloud/services/securitygroup/securitygroups.go +++ b/pkg/cloud/services/securitygroup/securitygroups.go @@ -162,6 +162,12 @@ func (s *Service) ReconcileSecurityGroups() error { func (s *Service) DeleteSecurityGroups() error { conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "") + + if 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 } @@ -194,11 +200,6 @@ func (s *Service) DeleteSecurityGroups() error { } } - if s.scope.VPC().ID == "" { - s.scope.V(0).Info("skipping cluster owned security group delete, vpc id nil", "vpc-id", s.scope.VPC().ID) - return nil - } - clusterGroups, err := s.describeClusterOwnedSecurityGroups() if err != nil { return err From 1fb7b6693299468643bc1c07e975dde8f84c454b Mon Sep 17 00:00:00 2001 From: LochanRn Date: Tue, 30 Mar 2021 12:53:49 +0530 Subject: [PATCH 3/4] changes based on review comments --- pkg/cloud/services/securitygroup/securitygroups.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/cloud/services/securitygroup/securitygroups.go b/pkg/cloud/services/securitygroup/securitygroups.go index fcbe74179b..ad9519a387 100644 --- a/pkg/cloud/services/securitygroup/securitygroups.go +++ b/pkg/cloud/services/securitygroup/securitygroups.go @@ -163,15 +163,16 @@ func (s *Service) ReconcileSecurityGroups() error { func (s *Service) DeleteSecurityGroups() error { conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "") + if err := s.scope.PatchObject(); err != nil { + return err + } + 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 - } - for _, sg := range s.scope.SecurityGroups() { current := sg.IngressRules From 6a10032dcbbad78bc4e683cd516aa023a8498056 Mon Sep 17 00:00:00 2001 From: LochanRn Date: Tue, 30 Mar 2021 23:28:47 +0530 Subject: [PATCH 4/4] removed space --- pkg/cloud/services/securitygroup/securitygroups.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/cloud/services/securitygroup/securitygroups.go b/pkg/cloud/services/securitygroup/securitygroups.go index ad9519a387..1744f67f1a 100644 --- a/pkg/cloud/services/securitygroup/securitygroups.go +++ b/pkg/cloud/services/securitygroup/securitygroups.go @@ -162,17 +162,16 @@ func (s *Service) ReconcileSecurityGroups() error { func (s *Service) DeleteSecurityGroups() error { conditions.MarkFalse(s.scope.InfraCluster(), infrav1.ClusterSecurityGroupsReadyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "") - - if err := s.scope.PatchObject(); err != nil { - return err - } - 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 + } + for _, sg := range s.scope.SecurityGroups() { current := sg.IngressRules