diff --git a/lib/istio/addon/components/modal-delete-istio/component.js b/lib/istio/addon/components/modal-delete-istio/component.js index cbb8a627f..b918540e2 100644 --- a/lib/istio/addon/components/modal-delete-istio/component.js +++ b/lib/istio/addon/components/modal-delete-istio/component.js @@ -34,11 +34,12 @@ export default Component.extend(ModalBase, { const { istioApp, onlyIstio, cluster } = this + const { systemProject } = cluster; + const istioSystemNamespace = ( systemProject.namespaces || []).findBy('id', 'istio-system'); set(this, 'saving', true) - const disableIstio = istioApp.delete() - const promises = [disableIstio] + const promises = [istioApp.delete(), istioSystemNamespace.delete()]; if (!onlyIstio) { promises.pushObject(cluster.doAction('disableMonitoring')) diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 27ab4c2ce..2661cc40e 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -7392,8 +7392,8 @@ machineTemplatesPage: modalDeleteIstio: title: 'Are you sure you want to disable:' onlyIstio: - true: Istio Only - false: Both Istio and Monitoring + true: Istio and remove Istio system namespace + false: Istio, Monitoring and remove Istio system namespace disable: Disable disabling: Disabling