rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3701 from westlywright/istio.bugs 

delete the istio-system namespace when disabling istio
This commit is contained in:
Westly Wright 2020-01-03 17:06:58 -07:00 committed by GitHub
parent eed4572ff2 56b4407b8e
commit 948d44e956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/istio/addon/components/modal-delete-istio/component.js
View File

@ -34,11 +34,12 @@ export default Component.extend(ModalBase, {
const { const {
istioApp, onlyIstio, cluster istioApp, onlyIstio, cluster
} = this } = this
const { systemProject } = cluster;
const istioSystemNamespace = ( systemProject.namespaces || []).findBy('id', 'istio-system');
set(this, 'saving', true) set(this, 'saving', true)
const disableIstio = istioApp.delete() const promises = [istioApp.delete(), istioSystemNamespace.delete()];
const promises = [disableIstio]
if (!onlyIstio) { if (!onlyIstio) {
promises.pushObject(cluster.doAction('disableMonitoring')) promises.pushObject(cluster.doAction('disableMonitoring'))

4
translations/en-us.yaml
View File

@ -7392,8 +7392,8 @@ machineTemplatesPage:
modalDeleteIstio: modalDeleteIstio:
title: 'Are you sure you want to disable:' title: 'Are you sure you want to disable:'
onlyIstio: onlyIstio:
true: Istio Only true: Istio and remove Istio system namespace
false: Both Istio and Monitoring false: Istio, Monitoring and remove Istio system namespace
disable: Disable disable: Disable
disabling: Disabling disabling: Disabling