Merge pull request #1120 from nader-ziada/delete-stuck

check resource group exist before delete

Author: k8s-ci-robot

cloud/services/groups/groups.go

@@ -86,6 +86,10 @@ func (s *Service) Delete(ctx context.Context) error {
 	defer span.End()
 
 	managed, err := s.IsGroupManaged(ctx)
+	if err != nil && azure.ResourceNotFound(err) {
+		// already deleted or doesn't exist
+		return nil
+	}
 	if err != nil {
 		return errors.Wrap(err, "could not get resource group management state")
 	}

cloud/services/groups/groups_test.go

@@ -150,6 +150,16 @@ func TestDeleteGroups(t *testing.T) {
 				)
 			},
 		},
+		{
+			name:          "resource group get returns error",
+			expectedError: "",
+			expect: func(s *mock_groups.MockGroupScopeMockRecorder, m *mock_groups.MockclientMockRecorder) {
+				s.V(gomock.AssignableToTypeOf(2)).AnyTimes().Return(klogr.New())
+				s.ResourceGroup().AnyTimes().Return("my-rg")
+				s.ClusterName().AnyTimes().Return("fake-cluster")
+				m.Get(gomockinternal.AContext(), "my-rg").Return(resources.Group{}, autorest.NewErrorWithResponse("", "", &http.Response{StatusCode: 404}, "Not Found"))
+			},
+		},
 		{
 			name:          "resource group deletion fails",
 			expectedError: "failed to delete resource group my-rg: #: Internal Server Error: StatusCode=500",