From 32aa9f50e068edc62a467f671907611bd9462121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= Date: Wed, 26 Jun 2019 18:31:16 +0100 Subject: Allow JupyterHub to be uninstalled - enabled uninstallation - give it a specific uninstall message - ajust specs --- .../components/uninstall_application_confirmation_modal.vue | 2 +- app/models/clusters/applications/jupyter.rb | 6 ------ locale/gitlab.pot | 3 +++ spec/models/clusters/applications/jupyter_spec.rb | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) 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 65827f1cb6a..8de34979dc8 100644 --- a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue +++ b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue @@ -14,7 +14,7 @@ const CUSTOM_APP_WARNING_TEXT = { [PROMETHEUS]: s__('ClusterIntegration|All data will be deleted and cannot be restored.'), [RUNNER]: s__('ClusterIntegration|Any running pipelines will be canceled.'), [KNATIVE]: s__('ClusterIntegration|The associated IP will be deleted and cannot be restored.'), - [JUPYTER]: '', + [JUPYTER]: s__('ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored.'), }; export default { diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb index 4aaa1f941e5..9e4b87d0993 100644 --- a/app/models/clusters/applications/jupyter.rb +++ b/app/models/clusters/applications/jupyter.rb @@ -40,12 +40,6 @@ module Clusters content_values.to_yaml end - # Will be addressed in future MRs - # We need to investigate and document what will be permanently deleted. - def allowed_to_uninstall? - false - end - def install_command Gitlab::Kubernetes::Helm::InstallCommand.new( name: name, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 6ab105f134e..2c6632151dd 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2269,6 +2269,9 @@ msgstr "" msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration" msgstr "" +msgid "ClusterIntegration|All data not committed to GitLab will be deleted and cannot be restored." +msgstr "" + msgid "ClusterIntegration|All data will be deleted and cannot be restored." msgstr "" diff --git a/spec/models/clusters/applications/jupyter_spec.rb b/spec/models/clusters/applications/jupyter_spec.rb index 43fa1010b2b..3ff66a074e4 100644 --- a/spec/models/clusters/applications/jupyter_spec.rb +++ b/spec/models/clusters/applications/jupyter_spec.rb @@ -16,7 +16,7 @@ describe Clusters::Applications::Jupyter do subject { jupyter.can_uninstall? } - it { is_expected.to be_falsey } + it { is_expected.to be_truthy } end describe '#set_initial_status' do -- cgit v1.2.1