Commit 30ede575 authored by João Cunha's avatar João Cunha Committed by Mayra Cabrera

Allow JupyterHub to be uninstalled

- enabled uninstallation
- give it a specific uninstall message
- ajust specs
parent e1a6b9f9
...@@ -14,7 +14,9 @@ const CUSTOM_APP_WARNING_TEXT = { ...@@ -14,7 +14,9 @@ const CUSTOM_APP_WARNING_TEXT = {
[PROMETHEUS]: s__('ClusterIntegration|All data will be deleted and cannot be restored.'), [PROMETHEUS]: s__('ClusterIntegration|All data will be deleted and cannot be restored.'),
[RUNNER]: s__('ClusterIntegration|Any running pipelines will be canceled.'), [RUNNER]: s__('ClusterIntegration|Any running pipelines will be canceled.'),
[KNATIVE]: s__('ClusterIntegration|The associated IP will be deleted and cannot be restored.'), [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 { export default {
......
...@@ -40,12 +40,6 @@ module Clusters ...@@ -40,12 +40,6 @@ module Clusters
content_values.to_yaml content_values.to_yaml
end 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 def install_command
Gitlab::Kubernetes::Helm::InstallCommand.new( Gitlab::Kubernetes::Helm::InstallCommand.new(
name: name, name: name,
......
---
title: Allow JupyterHub to be uninstalled from the UI
merge_request: 30097
author:
type: added
...@@ -251,6 +251,7 @@ The applications below can be uninstalled. ...@@ -251,6 +251,7 @@ The applications below can be uninstalled.
| Application | GitLab version | Notes | | Application | GitLab version | Notes |
| ----------- | -------------- | ----- | | ----------- | -------------- | ----- |
| JupyterHub | 12.1+ | All data not committed to GitLab will be deleted and cannot be restored. |
| Prometheus | 11.11+ | All data will be deleted and cannot be restored. | | Prometheus | 11.11+ | All data will be deleted and cannot be restored. |
To uninstall an application: To uninstall an application:
...@@ -287,4 +288,3 @@ To avoid installation errors: ...@@ -287,4 +288,3 @@ To avoid installation errors:
kubectl get secrets/tiller-secret -n gitlab-managed-apps -o "jsonpath={.data['ca\.crt']}" | base64 -d > b.pem kubectl get secrets/tiller-secret -n gitlab-managed-apps -o "jsonpath={.data['ca\.crt']}" | base64 -d > b.pem
diff a.pem b.pem diff a.pem b.pem
``` ```
...@@ -2272,6 +2272,9 @@ msgstr "" ...@@ -2272,6 +2272,9 @@ msgstr ""
msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration" msgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration"
msgstr "" 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." msgid "ClusterIntegration|All data will be deleted and cannot be restored."
msgstr "" msgstr ""
......
...@@ -16,7 +16,7 @@ describe Clusters::Applications::Jupyter do ...@@ -16,7 +16,7 @@ describe Clusters::Applications::Jupyter do
subject { jupyter.can_uninstall? } subject { jupyter.can_uninstall? }
it { is_expected.to be_falsey } it { is_expected.to be_truthy }
end end
describe '#set_initial_status' do describe '#set_initial_status' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment