Automatic merge of gitlab-org/gitlab-ce master

app/services/clusters/applications/check_installation_progress_service.rb

@@ -33,6 +33,10 @@ module Clusters
       def timed_out?
         Time.now.utc - app.updated_at.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
       end
+
+      def remove_installation_pod
+        helm_api.delete_pod!(pod_name)
+      end
     end
   end
 end

app/services/clusters/applications/check_uninstall_progress_service.rb

@@ -15,7 +15,7 @@ module Clusters
       rescue StandardError => e
         app.make_errored!(_('Application uninstalled but failed to destroy: %{error_message}') % { error_message: e.message })
       ensure
-        remove_installation_pod
+        remove_uninstallation_pod
       end
 
       def check_timeout
@@ -33,6 +33,10 @@ module Clusters
       def timed_out?
         Time.now.utc - app.updated_at.utc > WaitForUninstallAppWorker::TIMEOUT
       end
+
+      def remove_uninstallation_pod
+        helm_api.delete_pod!(pod_name)
+      end
     end
   end
 end

changelogs/unreleased/fix-regression-remove-installation-pod.yml

+---
+title: Fix removal of install pods
+merge_request: 32667
+author:
+type: fixed

spec/services/clusters/applications/check_installation_progress_service_spec.rb

@@ -142,7 +142,11 @@ describe Clusters::Applications::CheckInstallationProgressService, '#execute' do
       end
 
       it 'removes the installation POD' do
-        expect(service).to receive(:remove_installation_pod).once
+        expect_any_instance_of(Gitlab::Kubernetes::Helm::Api)
+          .to receive(:delete_pod!)
+          .with(kind_of(String))
+          .once
+        expect(service).to receive(:remove_installation_pod).and_call_original
 
         service.execute
       end

spec/services/clusters/applications/check_uninstall_progress_service_spec.rb

@@ -47,11 +47,15 @@ describe Clusters::Applications::CheckUninstallProgressService do
     context 'when installation POD succeeded' do
       let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
       before do
+        expect_any_instance_of(Gitlab::Kubernetes::Helm::Api)
+            .to receive(:delete_pod!)
+            .with(kind_of(String))
+            .once
         expect(service).to receive(:pod_phase).once.and_return(phase)
       end
 
       it 'removes the installation POD' do
-        expect(service).to receive(:remove_installation_pod).once
+        expect(service).to receive(:remove_uninstallation_pod).and_call_original
 
         service.execute
       end
@@ -76,7 +80,7 @@ describe Clusters::Applications::CheckUninstallProgressService do
         end
 
         it 'still removes the installation POD' do
-          expect(service).to receive(:remove_installation_pod).once
+          expect(service).to receive(:remove_uninstallation_pod).and_call_original
 
           service.execute
         end