From 83ad9ec8cc449dca0b57a34a10afd529326c1d57 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 24 Sep 2019 00:06:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../components/uninstall_application_confirmation_modal.vue | 13 ++++++++++---
 app/models/clusters/applications/helm.rb                    |  7 +++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
index 4f60e543666..f1925c243f2 100644
--- a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
+++ b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
@@ -5,8 +5,14 @@ import trackUninstallButtonClickMixin from 'ee_else_ce/clusters/mixins/track_uni
 import { HELM, INGRESS, CERT_MANAGER, PROMETHEUS, RUNNER, KNATIVE, JUPYTER } from '../constants';
 
 const CUSTOM_APP_WARNING_TEXT = {
-  [HELM]: s__(
-    'ClusterIntegration|The associated Tiller pod will be deleted and cannot be restored.',
+  [HELM]: sprintf(
+    s__(
+      'ClusterIntegration|The associated Tiller pod, the %{gitlabManagedAppsNamespace} namespace, and all of its resources will be deleted and cannot be restored.',
+    ),
+    {
+      gitlabManagedAppsNamespace: '<code>gitlab-managed-apps</code>',
+    },
+    false,
   ),
   [INGRESS]: s__(
     'ClusterIntegration|The associated load balancer and IP will be deleted and cannot be restored.',
@@ -76,6 +82,7 @@ export default {
     :modal-id="modalId"
     :title="title"
     @ok="confirmUninstall()"
-    >{{ warningText }} {{ customAppWarningText }}</gl-modal
   >
+    {{ warningText }} <span v-html="customAppWarningText"></span>
+  </gl-modal>
 </template>
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 261f6ce8987..4a1bcac4bb7 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -68,6 +68,13 @@ 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
-- 
cgit v1.2.1