Merge pull request #58 from oracle/uninstall-namespaces

added option to delete namespace when uninstalling operator and ingress controller

Author: robertpatrick

electron/app/js/ipcRendererPreload.js

@@ -145,6 +145,7 @@ contextBridge.exposeInMainWorld(
           'verify-file-exists',
           'ok-or-cancel-prompt',
           'yes-or-no-prompt',
+          'yes-no-or-cancel-prompt',
           'install-app-update',
           'get-latest-wdt-installer',
           'wit-cache-installers',
@@ -191,8 +192,7 @@ contextBridge.exposeInMainWorld(
           'k8s-delete-object',
           'openssl-generate-certs',
           'validate-k8s-namespaces-exist',
-          'validate-wko-domain-exist',
-          'domain-undeploy-scope-prompt'
+          'validate-wko-domain-exist'
         ];
         return new Promise((resolve, reject) => {
           if (validChannels.includes(channel)) {

electron/app/js/wktWindow.js

@@ -1002,25 +1002,25 @@ async function promptUserForYesOrNoAnswer(targetWindow, title, message) {
   });
 }
 
-async function promptUserForK8sDomainRemovalScope(targetWindow, title, question, details) {
+async function promptUserForYesNoOrCancelAnswer(targetWindow, title, question, details) {
   return new Promise(resolve => {
     dialog.showMessageBox(targetWindow, {
       title: title,
       message: question,
       detail: details,
       type: 'question',
-      buttons: [ i18n.t('button-cancel'), i18n.t('button-domain-only'), i18n.t('button-domain-namespace') ],
+      buttons: [ i18n.t('button-cancel'), i18n.t('button-no'), i18n.t('button-yes') ],
       defaultId: 1,
       cancelId: 0
     }).then(dialogResponse => {
       let response;
       switch (dialogResponse.response) {
         case 2:
-          response = 'namespace';
+          response = 'yes';
           break;
 
         case 1:
-          response = 'domain';
+          response = 'no';
           break;
 
         case 0:
@@ -1088,7 +1088,7 @@ module.exports = {
   setHasOpenDialog,
   setTargetType,
   showErrorMessage,
-  promptUserForK8sDomainRemovalScope,
   promptUserForOkOrCancelAnswer,
-  promptUserForYesOrNoAnswer
+  promptUserForYesOrNoAnswer,
+  promptUserForYesNoOrCancelAnswer
 };

electron/app/locales/en/electron.json

@@ -187,8 +187,6 @@
   "button-useExistingLocation": "Use Existing Location",
   "button-update-now": "Update and Restart Now",
   "button-update-on-exit": "Update when Application Exits",
-  "button-domain-only": "Remove Domain Only",
-  "button-domain-namespace": "Remove Entire Namespace",
 
   "tools-docker-hub": "Docker Hub",
 

electron/app/locales/en/webui.json

@@ -637,7 +637,6 @@
   "ingress-design-ingress-annotations": "Optional Annotations",
   "ingress-design-ingress-route-name-help": "The name to be used for creating this ingress route.",
   "ingress-design-ingress-route-virtualhost-help": "The virtual host name is used as the host routing rule for this ingress route.",
-  "ingress-design-ingress-route-virtualhost-help": "The virtual host name is used as the host routing rule for this ingress route.",
   "ingress-design-ingress-route-targetservice-help": "The target service is the where this ingress route will send the request to the backend Kubernetes service address.",
   "ingress-design-ingress-route-targetport-help": "The target port is the where this ingress route will send the request to the backend Kubernetes service port.",
   "ingress-design-ingress-route-path-help": "The URL path routing rule for this ingress route.",
@@ -696,18 +695,23 @@
 
   "ingress-uninstaller-aborted-error-title": "Ingress Controller Uninstall Aborted",
   "ingress-uninstaller-not-install-message": "The Install Ingress Controller option is off so there is nothing to do.",
+  "ingress-uninstaller-remove-namespace-prompt-title": "Uninstall {{provider}} Ingress Controller Scope",
+  "ingress-uninstaller-remove-namespace-prompt-question": "After uninstalling the {{provider}} Ingress Controller {{name}}, would you like to also delete the Kubernetes namespace {{namespace}} (and all of its data)?",
+  "ingress-uninstaller-remove-namespace-prompt-details": "Uninstalling the {{provider}} Ingress Controller {{name}} will make any running WebLogic domains unreachable from outside the Kubernetes cluster.  If you also choose to remove the Kubernetes namespace {{namespace}} will remove all secrets and other Kubernetes objects that exist in the Kubernetes namespace.",
   "ingress-uninstaller-kubectl-exe-invalid-error-message": "Unable to uninstall ingress controller because the Kubernetes client executable is invalid: {{error}}.",
   "ingress-uninstaller-helm-exe-invalid-error-message": "Unable to uninstall ingress controller because the Helm executable is invalid: {{error}}.",
   "ingress-uninstaller-project-not-saved-error-prefix": "Unable to uninstall ingress controller because project save failed",
   "ingress-uninstaller-set-context-error-message": "Unable to uninstall ingress controller because setting the Kubernetes client cluster context failed: {{error}}.",
   "ingress-uninstaller-checking-installed-in-progress": "Checking to see if the Ingress Controller {{name}} is installed in Kubernetes namespace {{namespace}}.",
   "ingress-uninstaller-checking-already-installed-error-message": "Unable to uninstall ingress controller {{name}} from Kubernetes namespace {{namespace}} because an error was encountered while trying to determine if the ingress controller is installed: {{error}}.",
   "ingress-uninstaller-ingress-not-installed-error-message": "Unable to uninstall the ingress controller {{name}} from Kubernetes namespace {{namespace}} because it does not appear to be installed.",
-  "ingress-uninstaller-uninstall-in-progress": "Uninstalling ingress controller {{name}} from Kubernetes namespace {{namespace}}",
-  "ingress-uninstaller-uninstall-complete-title": "Ingress Controller Uninstall Complete",
-  "ingress-uninstaller-uninstall-complete-message": "Ingress Controller {{name}} successfully uninstalled from Kubernetes namespace {{namespace}}.",
-  "ingress-uninstaller-uninstall-failed-title": "Ingress Controller Uninstall Failed",
-  "ingress-uninstaller-uninstall-failed-error-message": "Uninstalling ingress controller {{name}} from Kubernetes namespace {{namespace}} failed: {{error}}.",
+  "ingress-uninstaller-uninstall-in-progress": "Uninstalling {{provider}} ingress controller {{name}} from Kubernetes namespace {{namespace}}",
+  "ingress-uninstaller-remove-namespace-in-progress": "Removing Kubernetes namespace {{namespace}}",
+  "ingress-uninstaller-uninstall-complete-title": "{{provider}} Ingress Controller Uninstall Complete",
+  "ingress-uninstaller-uninstall-complete-message": "{{provider}} ingress controller {{name}} successfully uninstalled from Kubernetes namespace {{namespace}}.",
+  "ingress-uninstaller-uninstall-complete-with-namespace-message": "{{provider}} ingress controller {{name}} successfully uninstalled and Kubernetes namespace {{namespace}} was deleted.",
+  "ingress-uninstaller-uninstall-failed-title": "{{provider}} Ingress Controller Uninstall Failed",
+  "ingress-uninstaller-uninstall-failed-error-message": "Uninstalling {{provider}} ingress controller {{name}} from Kubernetes namespace {{namespace}} failed: {{error}}.",
   "ingress-uninstaller-uninstall-catch-all-error-message": "Ingress Controller uninstall failed with an unexpected error: {{error}}.",
 
   "ingress-routes-updater-update-aborted-error-title": "Ingress Routes Update Aborted",
@@ -989,6 +993,9 @@
   "wko-updater-update-catch-all-error-message": "WebLogic Kubernetes Operator update failed with an unexpected error: {{error}}",
 
   "wko-uninstaller-aborted-error-title": "WebLogic Kubernetes Operator Uninstall Aborted",
+  "wko-uninstaller-remove-namespace-prompt-title": "Uninstall WebLogic Kubernetes Operator Scope",
+  "wko-uninstaller-remove-namespace-prompt-question": "After uninstalling the WebLogic Kubernetes Operator {{name}}, would you like to also delete the Kubernetes namespace {{namespace}} (and all of its data)?",
+  "wko-uninstaller-remove-namespace-prompt-details": "Uninstalling the WebLogic Kubernetes Operator {{name}} will not stop any already running WebLogic domains but these domains will no longer be managed.  If you also choose to remove the Kubernetes namespace {{namespace}} will remove all secrets, service accounts, and other Kubernetes objects that exist in the Kubernetes namespace.",
   "wko-uninstaller-kubectl-exe-invalid-error-message": "Unable to uninstall WebLogic Kubernetes Operator because the Kubernetes client executable is invalid: {{error}}.",
   "wko-uninstaller-helm-exe-invalid-error-message": "Unable to uninstall WebLogic Kubernetes Operator because the Helm executable is invalid: {{error}}.",
   "wko-uninstaller-project-not-saved-error-prefix": "Unable to uninstall WebLogic Kubernetes Operator because project save failed",
@@ -999,10 +1006,12 @@
   "wko-uninstaller-add-chart-in-progress": "Adding WebLogic Kubernetes Operator Helm chart",
   "wko-uninstaller-add-chart-error-message": "Unable to uninstall WebLogic Kubernetes Operator because an error occurred while adding the Helm chart: {{error}}",
   "wko-uninstaller-uninstall-in-progress": "Uninstalling WebLogic Kubernetes Operator using Helm release name {{helmReleaseName}}",
+  "wko-uninstaller-remove-namespace-in-progress": "Removing Kubernetes namespace {{namespace}}",
   "wko-uninstaller-uninstall-complete-title": "WebLogic Kubernetes Operator Uninstall Complete",
-  "wko-uninstaller-uninstall-complete-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled to Kubernetes namespace {{operatorNamespace}}.",
+  "wko-uninstaller-uninstall-complete-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled from Kubernetes namespace {{operatorNamespace}}.",
+  "wko-uninstaller-uninstall-complete-with-namespace-message": "WebLogic Kubernetes Operator {{operatorName}} successfully uninstalled and Kubernetes namespace {{operatorNamespace}} was deleted.",
   "wko-uninstaller-uninstall-failed-title": "WebLogic Kubernetes Operator Uninstall Failed",
-  "wko-uninstaller-uninstall-failed-error-message":"Unable to uninstall WebLogic Kubernetes Operator {{operatorName}} to Kubernetes namespace {{operatorNamespace}}: {{error}}.",
+  "wko-uninstaller-uninstall-failed-error-message":"Unable to uninstall WebLogic Kubernetes Operator {{operatorName}} from Kubernetes namespace {{operatorNamespace}}: {{error}}.",
   "wko-uninstaller-uninstall-catch-all-error-message": "WebLogic Kubernetes Operator uninstall failed with an unexpected error: {{error}}",
 
   "k8s-domain-deployer-aborted-error-title": "Deploying WebLogic Domain to Kubernetes Aborted",
@@ -1036,10 +1045,9 @@
   "k8s-domain-script-generator-invalid-target-domain-location": "Unknown value for target domain location {{targetDomainLocation}}",
 
   "k8s-domain-undeployer-aborted-error-title": "Undeploying WebLogic Domain from Kubernetes Aborted",
-  "k8s-domain-undeployer-scope-prompt-title": "Undeploy WebLogic Domain from Kubernetes Scope",
-  "k8s-domain-undeployer-scope-prompt-question": "Would you like to undeploy the just WebLogic domain {{domainUid}} or the entire WebLogic domain's namespace {{domainNamespace}} (and all of its data) from Kubernetes?",
-  "k8s-domain-undeployer-scope-prompt-details": "Removing the WebLogic domain will remove the WebLogic Kubernetes Operator's domain custom resource {{domainUid}} and will cause any running pods associated with the domain to be shut down and removed.  Removing the WebLogic domain's namespace {{domainNamespace}} will, in addition to removing the WebLogic domain {{domainUid}}, remove all secrets, config maps, ingress routes, and other Kubernetes objects that exist in Kubernetes namespace.",
-  "k8s-domain-undeployer-prompt-result-assertion-error-message": "Unexpected prompt action 'cancel' while undeploying the Kubernetes WebLogic domain.  Please report an issue on GitHub.",
+  "k8s-domain-undeployer-remove-namespace-prompt-title": "Undeploy WebLogic Domain from Kubernetes Scope",
+  "k8s-domain-undeployer-remove-namespace-prompt-question": "After undeploying the WebLogic domain {{name}}, would you like to also delete the Kubernetes namespace {{namespace}} (and all of its data)?",
+  "k8s-domain-undeployer-remove-namespace-prompt-details": "UUndeploying the WebLogic domain will remove the WebLogic Kubernetes Operator's domain custom resource {{domainUid}} and will cause any running pods associated with the domain to be shut down and removed.  Removing the WebLogic domain's namespace {{domainNamespace}} will remove all secrets, config maps, ingress routes, and other Kubernetes objects that exist in the Kubernetes namespace.",
   "k8s-domain-undeployer-kubectl-exe-invalid-error-message": "Unable to undeploy the domain because the Kubernetes client executable is invalid: {{error}}.",
   "k8s-domain-undeployer-project-not-saved-error-prefix": "Unable to undeploy the domain because project save failed",
   "k8s-domain-undeployer-set-context-error-message": "Unable to undeploy the domain because setting the Kubernetes client content failed: {{error}}.",

electron/app/main.js

@@ -14,7 +14,8 @@ const i18n = require('./js/i18next.config');
 const { initializeLoggingSystem, logRendererMessage } = require('./js/wktLogging');
 const userSettings = require('./js/userSettings');
 const { chooseFromFileSystem, createNetworkWindow, createWindow, initialize, setHasOpenDialog, setTargetType,
-  showErrorMessage, promptUserForOkOrCancelAnswer, promptUserForYesOrNoAnswer, promptUserForK8sDomainRemovalScope } = require('./js/wktWindow');
+  showErrorMessage, promptUserForOkOrCancelAnswer, promptUserForYesOrNoAnswer, promptUserForYesNoOrCancelAnswer } =
+  require('./js/wktWindow');
 const project = require('./js/project');
 const wktTools = require('./js/wktTools');
 const wdtArchive = require('./js/wdtArchive');
@@ -641,6 +642,10 @@ class Main {
       return promptUserForYesOrNoAnswer(event.sender.getOwnerBrowserWindow(), title, question);
     });
 
+    ipcMain.handle('yes-no-or-cancel-prompt', async (event, title, question, details) => {
+      return promptUserForYesNoOrCancelAnswer(event.sender.getOwnerBrowserWindow(), title, question, details);
+    });
+
     ipcMain.handle('ok-or-cancel-prompt', async (event, title, question) => {
       return promptUserForOkOrCancelAnswer(event.sender.getOwnerBrowserWindow(), title, question);
     });
@@ -749,10 +754,6 @@ class Main {
       return kubectlUtils.deleteObjectIfExists(kubectlExe, namespace, object, kind, kubectlOptions);
     });
 
-    ipcMain.handle('domain-undeploy-scope-prompt', async (event, title, question, details) => {
-      return promptUserForK8sDomainRemovalScope(event.sender.getOwnerBrowserWindow(), title, question, details);
-    });
-
     ipcMain.handle('helm-add-wko-chart', async (event, helmExe, helmOptions) => {
       return helmUtils.addOrUpdateWkoHelmChart(helmExe, helmOptions);
     });

webui/src/js/utils/ingress-controller-uninstaller.js

@@ -37,7 +37,24 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper,
         return Promise.resolve(false);
       }
 
-      const totalSteps = 6.0;
+      const ingressControllerProvider = this.project.ingress.ingressControllerProvider.value;
+      const ingressControllerNamespace = this.project.ingress.ingressControllerNamespace.value;
+      const ingressControllerName = this.project.ingress.ingressControllerName.value;
+
+      const providerName = i18n.t(`ingress-design-type-${ingressControllerProvider}-label`);
+      const promptTitle = i18n.t('ingress-uninstaller-remove-namespace-prompt-title',
+        { provider: providerName });
+      const promptQuestion = i18n.t('ingress-uninstaller-remove-namespace-prompt-question',
+        { provider: providerName, name: ingressControllerName, namespace: ingressControllerNamespace });
+      const promptDetails = i18n.t('ingress-uninstaller-remove-namespace-prompt-details',
+        { provider: providerName, name: ingressControllerName, namespace: ingressControllerNamespace });
+      const removeNamespacePromptResult = await this.removeNamespacePrompt(promptTitle, promptQuestion, promptDetails);
+      if (removeNamespacePromptResult === 'cancel') {
+        return Promise.resolve(false);
+      }
+      const removeNamespace = removeNamespacePromptResult === 'yes';
+
+      const totalSteps = removeNamespace ? 7.0 : 6.0;
       try {
         let busyDialogMessage = i18n.t('flow-validate-kubectl-exe-in-progress');
         dialogHelper.openBusyDialog(busyDialogMessage, 'bar');
@@ -80,9 +97,6 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper,
         }
 
         const helmOptions = helmHelper.getHelmOptions();
-        const ingressControllerProvider = this.project.ingress.ingressControllerProvider.value;
-        const ingressControllerNamespace = this.project.ingress.ingressControllerNamespace.value;
-        const ingressControllerName = this.project.ingress.ingressControllerName.value;
 
         busyDialogMessage = i18n.t('ingress-uninstaller-checking-installed-in-progress',
           { name: ingressControllerName, namespace: ingressControllerNamespace });
@@ -103,21 +117,17 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper,
         }
 
         busyDialogMessage = i18n.t('ingress-uninstaller-uninstall-in-progress',
-          { name: ingressControllerName, namespace: ingressControllerNamespace });
+          { provider: providerName, name: ingressControllerName, namespace: ingressControllerNamespace });
         dialogHelper.updateBusyDialog(busyDialogMessage, 5/totalSteps);
         const uninstallResults = await window.api.ipc.invoke('helm-uninstall-ingress-controller',
           helmExe, ingressControllerName, ingressControllerNamespace, helmOptions);
-        if (uninstallResults.isSuccess) {
-          const title = i18n.t('ingress-uninstaller-uninstall-complete-title');
-          const message = i18n.t('ingress-uninstaller-uninstall-complete-message',
-            { name: ingressControllerName, namespace: ingressControllerNamespace });
-          dialogHelper.closeBusyDialog();
-          await window.api.ipc.invoke('show-info-message', title, message);
-          return Promise.resolve(true);
-        } else {
-          errTitle = i18n.t('ingress-uninstaller-uninstall-failed-title');
+
+
+        if (!uninstallResults.isSuccess) {
+          errTitle = i18n.t('ingress-uninstaller-uninstall-failed-title', { provider: providerName });
           const errMessage = i18n.t('ingress-uninstaller-uninstall-failed-error-message',
             {
+              provider: providerName,
               name: ingressControllerName,
               namespace: ingressControllerNamespace,
               error: uninstallResults.reason
@@ -126,6 +136,30 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper,
           await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
           return Promise.resolve(false);
         }
+
+        if (removeNamespace) {
+          busyDialogMessage = i18n.t('ingress-uninstaller-remove-namespace-in-progress',
+            { namespace: ingressControllerNamespace });
+          dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
+          const deleteResults = await this.deleteKubernetesObjectIfExists(kubectlExe, kubectlOptions,
+            null, 'namespace', ingressControllerNamespace, errTitle, errPrefix);
+          if (!deleteResults) {
+            return Promise.resolve(false);
+          }
+        }
+
+        const title = i18n.t('ingress-uninstaller-uninstall-complete-title', { provider: providerName });
+        let message;
+        if (removeNamespace) {
+          message = i18n.t('ingress-uninstaller-uninstall-complete-with-namespace-message',
+            {provider: providerName, name: ingressControllerName, namespace: ingressControllerNamespace});
+        } else {
+          message = i18n.t('ingress-uninstaller-uninstall-complete-message',
+            {provider: providerName, name: ingressControllerName, namespace: ingressControllerNamespace});
+        }
+        dialogHelper.closeBusyDialog();
+        await window.api.ipc.invoke('show-info-message', title, message);
+        return Promise.resolve(true);
       } catch (err) {
         dialogHelper.closeBusyDialog();
         throw err;