Add option to remove legacy Tiller server

Since GitLab 13.2, a local Tiller has been used for Helm 2 clusters,
and as of GitLab 13.6, Helm 3 is used by default. This re-adds the
Helm application row when the Helm record is present, to give existing
users an easy option to remove the unused Tiller server from their
cluster.

app/assets/javascripts/clusters/clusters_bundle.js

@@ -52,6 +52,7 @@ export default class Clusters {
       clusterStatus,
       clusterStatusReason,
       helpPath,
+      helmHelpPath,
       ingressHelpPath,
       ingressDnsHelpPath,
       ingressModSecurityHelpPath,
@@ -68,8 +69,9 @@ export default class Clusters {
     this.clusterBannerDismissedKey = `cluster_${this.clusterId}_banner_dismissed`;
 
     this.store = new ClustersStore();
-    this.store.setHelpPaths(
+    this.store.setHelpPaths({
       helpPath,
+      helmHelpPath,
       ingressHelpPath,
       ingressDnsHelpPath,
       ingressModSecurityHelpPath,
@@ -78,7 +80,7 @@ export default class Clusters {
       deployBoardsHelpPath,
       cloudRunHelpPath,
       ciliumHelpPath,
-    );
+    });
     this.store.setManagePrometheusPath(managePrometheusPath);
     this.store.updateStatus(clusterStatus);
     this.store.updateStatusReason(clusterStatusReason);
@@ -162,6 +164,7 @@ export default class Clusters {
             type,
             applications: this.state.applications,
             helpPath: this.state.helpPath,
+            helmHelpPath: this.state.helmHelpPath,
             ingressHelpPath: this.state.ingressHelpPath,
             managePrometheusPath: this.state.managePrometheusPath,
             ingressDnsHelpPath: this.state.ingressDnsHelpPath,

app/assets/javascripts/clusters/components/applications.vue

 <script>
 import { GlLoadingIcon, GlSprintf, GlLink } from '@gitlab/ui';
 import gitlabLogo from 'images/cluster_app_logos/gitlab.png';
+import helmLogo from 'images/cluster_app_logos/helm.png';
 import jupyterhubLogo from 'images/cluster_app_logos/jupyterhub.png';
 import kubernetesLogo from 'images/cluster_app_logos/kubernetes.png';
 import certManagerLogo from 'images/cluster_app_logos/cert_manager.png';
@@ -46,6 +47,11 @@ export default {
       required: false,
       default: '',
     },
+    helmHelpPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
     ingressHelpPath: {
       type: String,
       required: false,
@@ -150,6 +156,7 @@ export default {
   },
   logos: {
     gitlabLogo,
+    helmLogo,
     jupyterhubLogo,
     kubernetesLogo,
     certManagerLogo,
@@ -172,6 +179,35 @@ export default {
     </p>
 
     <div class="cluster-application-list gl-mt-3">
+      <application-row
+        v-if="applications.helm.installed || applications.helm.uninstalling"
+        id="helm"
+        :logo-url="$options.logos.helmLogo"
+        :title="applications.helm.title"
+        :status="applications.helm.status"
+        :status-reason="applications.helm.statusReason"
+        :request-status="applications.helm.requestStatus"
+        :request-reason="applications.helm.requestReason"
+        :installed="applications.helm.installed"
+        :install-failed="applications.helm.installFailed"
+        :uninstallable="applications.helm.uninstallable"
+        :uninstall-successful="applications.helm.uninstallSuccessful"
+        :uninstall-failed="applications.helm.uninstallFailed"
+        title-link="https://v2.helm.sh/"
+      >
+        <template #description>
+          <p>
+            {{
+              s__(`ClusterIntegration|Can be safely removed. Prior to GitLab
+              13.2, GitLab used a remote Tiller server to manage the
+              applications. GitLab no longer uses this server.
+              Uninstalling this server will not affect your other
+              applications. This row will disappear afterwards.`)
+            }}
+            <gl-link :href="helmHelpPath">{{ __('More information') }}</gl-link>
+          </p>
+        </template>
+      </application-row>
       <application-row
         :id="ingressId"
         :logo-url="$options.logos.kubernetesLogo"

app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue

@@ -16,7 +16,7 @@ import {
 const CUSTOM_APP_WARNING_TEXT = {
   [HELM]: sprintf(
     s__(
-      'ClusterIntegration|The associated Tiller pod, the %{gitlabManagedAppsNamespace} namespace, and all of its resources will be deleted and cannot be restored.',
+      'ClusterIntegration|The associated Tiller pod will be deleted and cannot be restored. Your other applications will remain unaffected.',
     ),
     {
       gitlabManagedAppsNamespace: '<code>gitlab-managed-apps</code>',

app/assets/javascripts/clusters/services/application_state_machine.js

@@ -193,6 +193,12 @@ const applicationStateMachine = {
           uninstallSuccessful: true,
         },
       },
+      [NOT_INSTALLABLE]: {
+        target: NOT_INSTALLABLE,
+        effects: {
+          uninstallSuccessful: true,
+        },
+      },
       [UNINSTALL_ERRORED]: {
         target: INSTALLED,
         effects: {

app/assets/javascripts/clusters/stores/clusters_store.js

@@ -36,6 +36,7 @@ export default class ClusterStore {
   constructor() {
     this.state = {
       helpPath: null,
+      helmHelpPath: null,
       ingressHelpPath: null,
       environmentsHelpPath: null,
       clustersHelpPath: null,
@@ -49,7 +50,7 @@ export default class ClusterStore {
       applications: {
         helm: {
           ...applicationInitialState,
-          title: s__('ClusterIntegration|Helm Tiller'),
+          title: s__('ClusterIntegration|Legacy Helm Tiller server'),
         },
         ingress: {
           ...applicationInitialState,
@@ -126,26 +127,10 @@ export default class ClusterStore {
     };
   }
 
-  setHelpPaths(
-    helpPath,
-    ingressHelpPath,
-    ingressDnsHelpPath,
-    ingressModSecurityHelpPath,
-    environmentsHelpPath,
-    clustersHelpPath,
-    deployBoardsHelpPath,
-    cloudRunHelpPath,
-    ciliumHelpPath,
-  ) {
-    this.state.helpPath = helpPath;
-    this.state.ingressHelpPath = ingressHelpPath;
-    this.state.ingressDnsHelpPath = ingressDnsHelpPath;
-    this.state.ingressModSecurityHelpPath = ingressModSecurityHelpPath;
-    this.state.environmentsHelpPath = environmentsHelpPath;
-    this.state.clustersHelpPath = clustersHelpPath;
-    this.state.deployBoardsHelpPath = deployBoardsHelpPath;
-    this.state.cloudRunHelpPath = cloudRunHelpPath;
-    this.state.ciliumHelpPath = ciliumHelpPath;
+  setHelpPaths(helpPaths) {
+    Object.assign(this.state, {
+      ...helpPaths,
+    });
   }
 
   setManagePrometheusPath(managePrometheusPath) {

app/models/clusters/applications/helm.rb

@@ -4,8 +4,8 @@ require 'openssl'
 
 module Clusters
   module Applications
-    # DEPRECATED: This model represents the Helm 2 Tiller server, and is no longer being actively used.
-    # It is being kept around for a potential cleanup of the unused Tiller server.
+    # DEPRECATED: This model represents the Helm 2 Tiller server.
+    # It is being kept around to enable the cleanup of the unused Tiller server.
     class Helm < ApplicationRecord
       self.table_name = 'clusters_applications_helm'
 
@@ -27,29 +27,11 @@ module Clusters
       end
 
       def set_initial_status
-        return unless not_installable?
-
-        self.status = status_states[:installable] if cluster&.platform_kubernetes_active?
-      end
-
-      # It can only be uninstalled if there are no other applications installed
-      # or with intermitent installation statuses in the database.
-      def allowed_to_uninstall?
-        strong_memoize(:allowed_to_uninstall) do
-          applications = nil
-
-          Clusters::Cluster::APPLICATIONS.each do |application_name, klass|
-            next if application_name == 'helm'
-
-            extra_apps = Clusters::Applications::Helm.where('EXISTS (?)', klass.select(1).where(cluster_id: cluster_id))
-
-            applications = applications ? applications.or(extra_apps) : extra_apps
-          end
-
-          !applications.exists?
-        end
+        # The legacy Tiller server is not installable, which is the initial status of every app
       end
 
+      # DEPRECATED: This command is only for development and testing purposes, to simulate
+      # a Helm 2 cluster with an existing Tiller server.
       def install_command
         Gitlab::Kubernetes::Helm::V2::InitCommand.new(
           name: name,
@@ -70,13 +52,6 @@ module Clusters
         ca_key.present? && ca_cert.present?
       end
 
-      def post_uninstall
-        cluster.kubeclient.delete_namespace(Gitlab::Kubernetes::Helm::NAMESPACE)
-      rescue Kubeclient::ResourceNotFoundError
-        # we actually don't care if the namespace is not present
-        # since we want to delete it anyway.
-      end
-
       private
 
       def files

app/views/clusters/clusters/show.html.haml

@@ -27,6 +27,7 @@
   provider_type: @cluster.provider_type,
   pre_installed_knative: @cluster.knative_pre_installed? ? 'true': 'false',
   help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications'),
+  helm_help_path: help_page_path('user/clusters/applications.md', anchor: 'helm'),
   ingress_help_path: help_page_path('user/project/clusters/index.md', anchor: 'getting-the-external-endpoint'),
   ingress_dns_help_path: help_page_path('user/clusters/applications.md', anchor: 'pointing-your-dns-at-the-external-endpoint'),
   ingress_mod_security_help_path: help_page_path('user/clusters/applications.md', anchor: 'web-application-firewall-modsecurity'),

changelogs/unreleased/add-option-to-remove-legacy-tiller-server.yml

+---
+title: Add option to uninstall the legacy Tiller server for clusters added before GitLab 13.2
+merge_request: 47457
+author:
+type: changed

doc/user/clusters/applications.md

@@ -65,6 +65,7 @@ supported by GitLab before installing any of the applications.
 > - Introduced in GitLab 11.6 for group-level clusters.
 > - [Uses a local Tiller](https://gitlab.com/gitlab-org/gitlab/-/issues/209736) in GitLab 13.2 and later.
 > - [Uses Helm 3](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46267) for clusters created with GitLab 13.6 and later.
+> - [Offers legacy Tiller removal](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47457) in GitLab 13.7 and later.
 
 [Helm](https://helm.sh/docs/) is a package manager for Kubernetes and is
 used to install the GitLab-managed apps. GitLab runs each `helm` command
@@ -72,12 +73,12 @@ in a pod within the `gitlab-managed-apps` namespace inside the cluster.
 
 - For clusters created on GitLab 13.6 and newer, GitLab uses Helm 3 to manage
   applications.
-- For clusters created on versions of GitLab prior to 13.6, GitLab uses
-  Helm 2 with a local [Tiller](https://v2.helm.sh/docs/glossary/#tiller) server.
-  Prior to [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/209736),
-  GitLab used an in-cluster Tiller server in the `gitlab-managed-apps`
-  namespace. You can safely remove this server after upgrading to GitLab 13.2
-  or newer.
+- For clusters created on versions of GitLab prior to 13.6, GitLab uses Helm 2
+  with a local [Tiller](https://v2.helm.sh/docs/glossary/#tiller) server. Prior
+  to [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/209736), GitLab
+  used an in-cluster Tiller server in the `gitlab-managed-apps` namespace. You
+  can safely uninstall the server from GitLab's application page if you have
+  previously installed it. This will not affect your other applications.
 
 GitLab's Helm integration does not support installing applications behind a proxy,
 but a [workaround](../../topics/autodevops/index.md#install-applications-behind-a-proxy)

lib/gitlab/kubernetes/helm/v2/client_command.rb

@@ -22,17 +22,6 @@ module Gitlab
           def repository_update_command
             'helm repo update'
           end
-
-          def optional_tls_flags
-            return [] unless files.key?(:'ca.pem')
-
-            [
-              '--tls',
-              '--tls-ca-cert', "#{files_dir}/ca.pem",
-              '--tls-cert', "#{files_dir}/cert.pem",
-              '--tls-key', "#{files_dir}/key.pem"
-            ]
-          end
         end
       end
     end

lib/gitlab/kubernetes/helm/v2/reset_command.rb

@@ -9,9 +9,8 @@ module Gitlab
 
           def generate_script
             super + [
-              reset_helm_command,
-              delete_tiller_replicaset,
-              delete_tiller_clusterrolebinding
+              init_command,
+              reset_helm_command
             ].join("\n")
           end
 
@@ -21,27 +20,8 @@ module Gitlab
 
           private
 
-          # This method can be delete once we upgrade Helm to > 12.13.0
-          # https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/27096#note_159695900
-          #
-          # Tracking this method to be removed here:
-          # https://gitlab.com/gitlab-org/gitlab-foss/issues/52791#note_199374155
-          def delete_tiller_replicaset
-            delete_args = %w[replicaset -n gitlab-managed-apps -l name=tiller]
-
-            Gitlab::Kubernetes::KubectlCmd.delete(*delete_args)
-          end
-
-          def delete_tiller_clusterrolebinding
-            delete_args = %w[clusterrolebinding tiller-admin]
-
-            Gitlab::Kubernetes::KubectlCmd.delete(*delete_args)
-          end
-
           def reset_helm_command
-            command = %w[helm reset] + optional_tls_flags
-
-            command.shelljoin
+            'helm reset --force'
           end
         end
       end

locale/gitlab.pot

@@ -5842,6 +5842,9 @@ msgstr ""
 msgid "ClusterIntegration|CA Certificate"
 msgstr ""
 
+msgid "ClusterIntegration|Can be safely removed. Prior to GitLab 13.2, GitLab used a remote Tiller server to manage the applications. GitLab no longer uses this server. Uninstalling this server will not affect your other applications. This row will disappear afterwards."
+msgstr ""
+
 msgid "ClusterIntegration|Cert-Manager"
 msgstr ""
 
@@ -6100,9 +6103,6 @@ msgstr ""
 msgid "ClusterIntegration|HTTP Error"
 msgstr ""
 
-msgid "ClusterIntegration|Helm Tiller"
-msgstr ""
-
 msgid "ClusterIntegration|Helm release failed to install"
 msgstr ""
 
@@ -6205,6 +6205,9 @@ msgstr ""
 msgid "ClusterIntegration|Learn more about instance Kubernetes clusters"
 msgstr ""
 
+msgid "ClusterIntegration|Legacy Helm Tiller server"
+msgstr ""
+
 msgid "ClusterIntegration|Loading IAM Roles"
 msgstr ""
 
@@ -6538,7 +6541,7 @@ msgstr ""
 msgid "ClusterIntegration|The associated IP and all deployed services will be deleted and cannot be restored. Uninstalling Knative will also remove Istio from your cluster. This will not effect any other applications."
 msgstr ""
 
-msgid "ClusterIntegration|The associated Tiller pod, the %{gitlabManagedAppsNamespace} namespace, and all of its resources will be deleted and cannot be restored."
+msgid "ClusterIntegration|The associated Tiller pod will be deleted and cannot be restored. Your other applications will remain unaffected."
 msgstr ""
 
 msgid "ClusterIntegration|The associated load balancer and IP will be deleted and cannot be restored."

spec/controllers/admin/clusters/applications_controller_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do
       post :create, params: params
     end
 
-    let(:application) { 'helm' }
+    let(:application) { 'ingress' }
     let(:params) { { application: application, id: cluster.id } }
 
     describe 'functionality' do
@@ -37,7 +37,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do
 
         expect { subject }.to change { current_application.count }
         expect(response).to have_gitlab_http_status(:no_content)
-        expect(cluster.application_helm).to be_scheduled
+        expect(cluster.application_ingress).to be_scheduled
       end
 
       context 'when cluster do not exists' do
@@ -61,7 +61,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do
 
       context 'when application is already installing' do
         before do
-          create(:clusters_applications_helm, :installing, cluster: cluster)
+          create(:clusters_applications_ingress, :installing, cluster: cluster)
         end
 
         it 'returns 400' do

spec/controllers/groups/clusters/applications_controller_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do
       post :create, params: params.merge(group_id: group)
     end
 
-    let(:application) { 'helm' }
+    let(:application) { 'ingress' }
     let(:params) { { application: application, id: cluster.id } }
 
     describe 'functionality' do
@@ -44,7 +44,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do
 
         expect { subject }.to change { current_application.count }
         expect(response).to have_gitlab_http_status(:no_content)
-        expect(cluster.application_helm).to be_scheduled
+        expect(cluster.application_ingress).to be_scheduled
       end
 
       context 'when cluster do not exists' do
@@ -68,7 +68,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do
 
       context 'when application is already installing' do
         before do
-          create(:clusters_applications_helm, :installing, cluster: cluster)
+          create(:clusters_applications_ingress, :installing, cluster: cluster)
         end
 
         it 'returns 400' do

spec/controllers/projects/clusters/applications_controller_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do
 
     let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
     let(:project) { cluster.project }
-    let(:application) { 'helm' }
+    let(:application) { 'ingress' }
     let(:params) { { application: application, id: cluster.id } }
 
     describe 'functionality' do
@@ -48,7 +48,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do
 
         expect { subject }.to change { current_application.count }
         expect(response).to have_gitlab_http_status(:no_content)
-        expect(cluster.application_helm).to be_scheduled
+        expect(cluster.application_ingress).to be_scheduled
       end
 
       context 'when cluster do not exists' do
@@ -72,7 +72,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do
 
       context 'when application is already installing' do
         before do
-          create(:clusters_applications_helm, :installing, cluster: cluster)
+          create(:clusters_applications_ingress, :installing, cluster: cluster)
         end
 
         it 'returns 400' do

spec/frontend/clusters/stores/clusters_store_spec.js

@@ -50,6 +50,7 @@ describe('Clusters Store', () => {
 
       expect(store.state).toEqual({
         helpPath: null,
+        helmHelpPath: null,
         ingressHelpPath: null,
         environmentsHelpPath: null,
         clustersHelpPath: null,
@@ -62,7 +63,7 @@ describe('Clusters Store', () => {
         rbac: false,
         applications: {
           helm: {
-            title: 'Helm Tiller',
+            title: 'Legacy Helm Tiller server',
             status: mockResponseData.applications[0].status,
             statusReason: mockResponseData.applications[0].status_reason,
             requestReason: null,

spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb

@@ -12,32 +12,14 @@ RSpec.describe Gitlab::Kubernetes::Helm::V2::ResetCommand do
   it_behaves_like 'helm command generator' do
     let(:commands) do
       <<~EOS
-      helm reset
-      kubectl delete replicaset -n gitlab-managed-apps -l name\\=tiller
-      kubectl delete clusterrolebinding tiller-admin
+      export HELM_HOST="localhost:44134"
+      tiller -listen ${HELM_HOST} -alsologtostderr &
+      helm init --client-only
+      helm reset --force
       EOS
     end
   end
 
-  context 'when there is a ca.pem file' do
-    let(:files) { { 'ca.pem': 'some file content' } }
-
-    it_behaves_like 'helm command generator' do
-      let(:commands) do
-        <<~EOS1.squish + "\n" + <<~EOS2
-        helm reset
-        --tls
-        --tls-ca-cert /data/helm/helm/config/ca.pem
-        --tls-cert /data/helm/helm/config/cert.pem
-        --tls-key /data/helm/helm/config/key.pem
-        EOS1
-          kubectl delete replicaset -n gitlab-managed-apps -l name\\=tiller
-          kubectl delete clusterrolebinding tiller-admin
-        EOS2
-      end
-    end
-  end
-
   describe '#pod_name' do
     subject { reset_command.pod_name }
 

spec/models/clusters/applications/helm_spec.rb

@@ -19,35 +19,9 @@ RSpec.describe Clusters::Applications::Helm do
   end
 
   describe '#can_uninstall?' do
-    context "with other existing applications" do
-      Clusters::Cluster::APPLICATIONS.keys.each do |application_name|
-        next if application_name == 'helm'
+    subject(:application) { build(:clusters_applications_helm).can_uninstall? }
 
-        it "is false when #{application_name} is installed" do
-          cluster_application = create("clusters_applications_#{application_name}".to_sym)
-
-          helm = cluster_application.cluster.application_helm
-
-          expect(helm.allowed_to_uninstall?).to be_falsy
-        end
-      end
-
-      it 'executes a single query only' do
-        cluster_application = create(:clusters_applications_ingress)
-        helm = cluster_application.cluster.application_helm
-
-        query_count = ActiveRecord::QueryRecorder.new { helm.allowed_to_uninstall? }.count
-        expect(query_count).to eq(1)
-      end
-    end
-
-    context "without other existing applications" do
-      subject { helm.can_uninstall? }
-
-      let(:helm) { create(:clusters_applications_helm) }
-
-      it { is_expected.to be_truthy }
-    end
+    it { is_expected.to eq true }
   end
 
   describe '#issue_client_cert' do
@@ -135,14 +109,4 @@ RSpec.describe Clusters::Applications::Helm do
       end
     end
   end
-
-  describe '#post_uninstall' do
-    let(:helm) { create(:clusters_applications_helm, :installed) }
-
-    it do
-      expect(helm.cluster.kubeclient).to receive(:delete_namespace).with('gitlab-managed-apps')
-
-      helm.post_uninstall
-    end
-  end
 end

spec/services/clusters/applications/create_service_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Clusters::Applications::CreateService do
 
   let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
   let(:user) { create(:user) }
-  let(:params) { { application: 'helm' } }
+  let(:params) { { application: 'ingress' } }
   let(:service) { described_class.new(cluster, user, params) }
 
   describe '#execute' do
@@ -23,16 +23,16 @@ RSpec.describe Clusters::Applications::CreateService do
         subject
 
         cluster.reload
-      end.to change(cluster, :application_helm)
+      end.to change(cluster, :application_ingress)
     end
 
     context 'application already installed' do
-      let!(:application) { create(:clusters_applications_helm, :installed, cluster: cluster) }
+      let!(:application) { create(:clusters_applications_ingress, :installed, cluster: cluster) }
 
       it 'does not create a new application' do
         expect do
           subject
-        end.not_to change(Clusters::Applications::Helm, :count)
+        end.not_to change(Clusters::Applications::Ingress, :count)
       end
 
       it 'schedules an upgrade for the application' do
@@ -43,10 +43,6 @@ RSpec.describe Clusters::Applications::CreateService do
     end
 
     context 'known applications' do
-      before do
-        create(:clusters_applications_helm, :installed, cluster: cluster)
-      end
-
       context 'ingress application' do
         let(:params) do
           {
@@ -215,19 +211,17 @@ RSpec.describe Clusters::Applications::CreateService do
 
       using RSpec::Parameterized::TableSyntax
 
-      where(:application, :association, :allowed, :pre_create_helm, :pre_create_ingress) do
-        'helm'       | :application_helm       | true | false | false
-        'ingress'    | :application_ingress    | true | true | false
-        'runner'     | :application_runner     | true | true | false
-        'prometheus' | :application_prometheus | true | true | false
-        'jupyter'    | :application_jupyter    | true | true | true
+      where(:application, :association, :allowed, :pre_create_ingress) do
+        'ingress'    | :application_ingress    | true | false
+        'runner'     | :application_runner     | true | false
+        'prometheus' | :application_prometheus | true | false
+        'jupyter'    | :application_jupyter    | true | true
       end
 
       with_them do
         before do
           klass = "Clusters::Applications::#{application.titleize}"
           allow_any_instance_of(klass.constantize).to receive(:make_scheduled!).and_call_original
-          create(:clusters_applications_helm, :installed, cluster: cluster) if pre_create_helm
           create(:clusters_applications_ingress, :installed, cluster: cluster, external_hostname: 'example.com') if pre_create_ingress
         end
 
@@ -252,7 +246,7 @@ RSpec.describe Clusters::Applications::CreateService do
         it 'makes the application scheduled' do
           expect do
             subject
-          end.to change { Clusters::Applications::Helm.with_status(:scheduled).count }.by(1)
+          end.to change { Clusters::Applications::Ingress.with_status(:scheduled).count }.by(1)
         end
 
         it 'schedules an install via worker' do
@@ -266,7 +260,7 @@ RSpec.describe Clusters::Applications::CreateService do
       end
 
       context 'when application is associated with a cluster' do
-        let(:application) { create(:clusters_applications_helm, :installable, cluster: cluster) }
+        let(:application) { create(:clusters_applications_ingress, :installable, cluster: cluster) }
         let(:worker_arguments) { [application.name, application.id] }
 
         it_behaves_like 'installable applications'
@@ -280,7 +274,7 @@ RSpec.describe Clusters::Applications::CreateService do
     end
 
     context 'when installation is already in progress' do
-      let!(:application) { create(:clusters_applications_helm, :installing, cluster: cluster) }
+      let!(:application) { create(:clusters_applications_ingress, :installing, cluster: cluster) }
 
       it 'raises an exception' do
         expect { subject }
@@ -295,7 +289,7 @@ RSpec.describe Clusters::Applications::CreateService do
 
     context 'when application is installed' do
       %i(installed updated).each do |status|
-        let(:application) { create(:clusters_applications_helm, status, cluster: cluster) }
+        let(:application) { create(:clusters_applications_ingress, status, cluster: cluster) }
 
         it 'schedules an upgrade via worker' do
           expect(ClusterUpgradeAppWorker)

spec/services/clusters/cleanup/app_service_spec.rb

@@ -67,7 +67,8 @@ RSpec.describe Clusters::Cleanup::AppService do
 
         it 'only uninstalls apps that are not dependencies for other installed apps' do
           expect(Clusters::Applications::UninstallWorker)
-            .not_to receive(:perform_async).with(helm.name, helm.id)
+            .to receive(:perform_async).with(helm.name, helm.id)
+            .and_call_original
 
           expect(Clusters::Applications::UninstallWorker)
             .not_to receive(:perform_async).with(ingress.name, ingress.id)
@@ -85,7 +86,7 @@ RSpec.describe Clusters::Cleanup::AppService do
 
         it 'logs application uninstalls and next execution' do
           expect(logger).to receive(:info)
-            .with(log_meta.merge(event: :uninstalling_app, application: kind_of(String))).twice
+            .with(log_meta.merge(event: :uninstalling_app, application: kind_of(String))).exactly(3).times
           expect(logger).to receive(:info)
             .with(log_meta.merge(event: :scheduling_execution, next_execution: 1))