Merge pull request #3996 from Skarlso/fix_deleting_egress_only_iwg

Ignore EIGW deletion in case of unmanaged VPC

Author: k8s-ci-robot

pkg/cloud/services/network/egress_only_gateways.go

@@ -82,6 +82,11 @@ func (s *Service) deleteEgressOnlyInternetGateways() error {
 		return nil
 	}
 
+	if s.scope.VPC().IsUnmanaged(s.scope.Name()) {
+		s.scope.Trace("Skipping egress only internet gateway deletion in unmanaged mode")
+		return nil
+	}
+
 	eigws, err := s.describeEgressOnlyVpcInternetGateways()
 	if awserrors.IsNotFound(err) {
 		return nil

pkg/cloud/services/network/egress_only_gateways_test.go

@@ -172,6 +172,16 @@ func TestDeleteEgressOnlyInternetGateways(t *testing.T) {
 			},
 			expect: func(m *mocks.MockEC2APIMockRecorder) {},
 		},
+		{
+			name: "Should ignore deletion if vpc is unmanaged",
+			input: &infrav1.NetworkSpec{
+				VPC: infrav1.VPCSpec{
+					IPv6: &infrav1.IPv6{},
+					ID:   "vpc-gateways",
+				},
+			},
+			expect: func(m *mocks.MockEC2APIMockRecorder) {},
+		},
 		{
 			name: "Should ignore deletion if egress only internet gateway is not found",
 			input: &infrav1.NetworkSpec{

pkg/cloud/services/network/gateways.go

@@ -60,7 +60,7 @@ func (s *Service) reconcileInternetGateways() error {
 	gateway := igs[0]
 	s.scope.VPC().InternetGatewayID = gateway.InternetGatewayId
 
-	// Make sure tags are up to date.
+	// Make sure tags are up-to-date.
 	if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {
 		buildParams := s.getGatewayTagParams(*gateway.InternetGatewayId)
 		tagsBuilder := tags.New(&buildParams, tags.WithEC2(s.EC2Client))