intermediate savepoint

Author: robertpatrick

electron/app/js/helmUtils.js

@@ -114,7 +114,7 @@ async function installWko(helmExe, name, namespace, helmChartValues, helmOptions
   return _runHelmWko(helmExe, name, namespace, args, helmOptions, 'helm-install-wko-failed-error-message');
 }
 
-async function upgradeWko(helmExe, name, namespace, helmChartValues, helmOptions) {
+async function updateWko(helmExe, name, namespace, helmChartValues, helmOptions) {
   const args = [ 'upgrade', name, _wkoHelmChartName, '--namespace', namespace, '--reuse-values' ];
   processHelmChartValues(args, helmChartValues);
   processHelmOptions(args, helmOptions);
@@ -123,6 +123,14 @@ async function upgradeWko(helmExe, name, namespace, helmChartValues, helmOptions
   return _runHelmWko(helmExe, name, namespace, args, helmOptions, 'helm-upgrade-wko-failed-error-message');
 }
 
+async function uninstallWko(helmExe, name, namespace, helmOptions) {
+  const args = [ 'uninstall', name, '--namespace', namespace ];
+  processHelmOptions(args, helmOptions);
+
+  return _runHelmWko(helmExe, name, namespace, args, helmOptions, 'helm-uninstall-wko-failed-error-message');
+}
+
+
 async function helmListAllNamespaces(helmExe, helmOptions) {
   const args = [ 'list', '--all-namespaces' ];
   processHelmOptions(args, helmOptions);
@@ -245,7 +253,8 @@ function formatArrayOfObjectsSetArgument(name, objectArray) {
 module.exports = {
   addOrUpdateWkoHelmChart,
   installWko,
-  upgradeWko,
+  uninstallWko,
+  updateWko,
   helmListAllNamespaces,
   installIngressController,
   addOrUpdateHelmChart,

electron/app/js/ipcRendererPreload.js

@@ -70,6 +70,8 @@ contextBridge.exposeInMainWorld(
           'start-push-aux-image',
           'start-k8s-verify-connection',
           'start-wko-install',
+          'start-wko-uninstall',
+          'start-wko-update',
           'start-ingress-install',
           'add-ingress-routes',
           'app-download-progress',
@@ -164,15 +166,16 @@ contextBridge.exposeInMainWorld(
           'k8s-apply',
           'k8s-label-namespace',
           'k8s-get-service-details',
-          'k8s-get-operator-version-from-dm',
+          'k8s-get-operator-version-from-domain-config-map',
           'k8s-get-k8s-config',
           'k8s-get-k8s-cluster-info',
           'k8s-get-wko-domain-status',
           'k8s-get-operator-status',
           'k8s-get-operator-log',
           'helm-add-wko-chart',
           'helm-install-wko',
-          'helm-upgrade-wko',
+          'helm-uninstall-wko',
+          'helm-update-wko',
           'get-ingress-tlskeyfile',
           'get-ingress-tlscertfile',
           'helm-list-all-namespaces',
@@ -211,6 +214,7 @@ contextBridge.exposeInMainWorld(
       getDockerFilePath: () => fsUtils.getExecutableFilePath('docker', exeMode),
       getPodmanFilePath: () => fsUtils.getExecutableFilePath('podman', exeMode),
       getKubeConfig: () => k8sUtils.getKubeConfig(),
+      getImageTagComponents: (imageTag) => k8sUtils.splitImageNameAndVersion(imageTag),
       getKubectlFilePath: () => fsUtils.getExecutableFilePath('kubectl'),
       getHelmFilePath: () => fsUtils.getExecutableFilePath('helm', exeMode),
       getOpenSSLFilePath: () => fsUtils.getExecutableFilePath('openssl'),

electron/app/js/k8sUtils.js

@@ -39,7 +39,45 @@ function getRegistryAddressFromImageTag(tag) {
   return result;
 }
 
+// Need to handle all possible flavors of the tag:
+//
+//  - my-registry/foo/image
+//  - my-registry/foo/image:1.0
+//  - 2001:0db8:85a3:0000:0000:8a2e:0370:7334/foo/image
+//  - 2001:0db8:85a3:0000:0000:8a2e:0370:7334/foo/image:1.0
+//  - my-registry:8888/foo/image
+//  - my-registry:8888/foo/image:1.0
+//
+function splitImageNameAndVersion(imageTag) {
+  let imageName = imageTag;
+  let imageVersion = 'latest';
+  if (imageTag) {
+    const lastColon = imageTag.lastIndexOf(':');
+    const firstSlash = imageTag.indexOf('/');
+
+    // If no colon, then the imageTag is the imageName...
+    if (lastColon !== -1) {
+      // There may or may not be a slash in the image tag.  The important
+      // thing we have to check is if the first slash (if there is one)
+      // is before or after the last colon.
+      //
+      // If before, the colon found is separating the image name from the version.
+      //
+      // If after, the colon found is part of the registry address.  It could be
+      // separating the port number from the DNS name/IP address, or it could be
+      // part of an IPv6 address.  Either way, there is no version specified.
+      //
+      if (firstSlash < lastColon) {
+        imageName = imageTag.slice(0, lastColon);
+        imageVersion = imageTag.slice(lastColon + 1);
+      }
+    }
+  }
+  return { name: imageName, version: imageVersion };
+}
+
 module.exports = {
   getKubeConfig,
-  getRegistryAddressFromImageTag
+  getRegistryAddressFromImageTag,
+  splitImageNameAndVersion
 };

electron/app/js/kubectlUtils.js

@@ -14,6 +14,7 @@ const { getLogger } = require('./wktLogging');
 const { getHttpsProxyUrl, getBypassProxyHosts } = require('./userSettings');
 const { getErrorMessage } = require('./errorUtils');
 const osUtils = require('./osUtils');
+const k8sUtils = require('./k8sUtils');
 
 /* global process */
 async function validateKubectlExe(kubectlExe) {
@@ -198,7 +199,7 @@ async function getOperatorLogs(kubectlExe, operatorNamespace, options) {
   });
 }
 
-async function getOperatorVersionFromDomainCM(kubectlExe, domainNamespace, options) {
+async function getOperatorVersionFromDomainConfigMap(kubectlExe, domainNamespace, options) {
   const args = [ 'get', 'configmap', 'weblogic-scripts-cm', '-n', domainNamespace, '-o', 'jsonpath={.metadata.labels.weblogic\\.operatorVersion}'];
 
   const httpsProxyUrl = getHttpsProxyUrl();
@@ -222,7 +223,6 @@ async function getOperatorVersionFromDomainCM(kubectlExe, domainNamespace, optio
   });
 }
 
-
 async function verifyClusterConnectivity(kubectlExe, options) {
   const args = [ 'version', '--short' ];
   const httpsProxyUrl = getHttpsProxyUrl();
@@ -644,23 +644,13 @@ function getOperatorImageTag(operatorDeployment) {
 }
 
 function getOperatorImageWithoutVersion(imageTag) {
-  let imageName = imageTag;
-  if (imageTag) {
-    imageName = imageTag.split(':')[0];
-  }
-  return imageName;
+  const imageComponents = k8sUtils.splitImageNameAndVersion(imageTag);
+  return imageComponents.name;
 }
 
 function getOperatorImageVersion(imageTag) {
-  let version;
-  if (imageTag) {
-    if (imageTag.indexOf(':') !== -1) {
-      version = imageTag.split(':')[1];
-    } else {
-      version = 'latest';
-    }
-  }
-  return version;
+  const imageComponents = k8sUtils.splitImageNameAndVersion(imageTag);
+  return imageComponents.version;
 }
 
 function doesNamedObjectExist(objectListJson, name) {
@@ -777,7 +767,7 @@ module.exports = {
   getK8sClusterInfo,
   getWkoDomainStatus,
   getOperatorStatus,
-  getOperatorVersionFromDomainCM,
+  getOperatorVersionFromDomainConfigMap,
   getOperatorLogs,
   validateNamespacesExist,
   validateDomainExist,

electron/app/js/wktWindow.js

@@ -327,6 +327,36 @@ class WktAppMenu {
               sendToWindow(focusedWindow,'start-wko-install');
             }
           },
+          {
+            id: 'updateOperator',
+            label: i18n.t('menu-go-update-operator'),
+            visible: this._isWkoTarget,
+            enabled: !this._hasOpenDialog,
+            click(item, focusedWindow) {
+              if (!focusedWindow) {
+                return dialog.showErrorBox(
+                  i18n.t('menu-go-update-operator-error-title'),
+                  i18n.t('menu-go-update-operator-error-message')
+                );
+              }
+              sendToWindow(focusedWindow,'start-wko-update');
+            }
+          },
+          {
+            id: 'uninstallOperator',
+            label: i18n.t('menu-go-uninstall-operator'),
+            visible: this._isWkoTarget,
+            enabled: !this._hasOpenDialog,
+            click(item, focusedWindow) {
+              if (!focusedWindow) {
+                return dialog.showErrorBox(
+                  i18n.t('menu-go-uninstall-operator-error-title'),
+                  i18n.t('menu-go-uninstall-operator-error-message')
+                );
+              }
+              sendToWindow(focusedWindow,'start-wko-uninstall');
+            }
+          },
           {
             id: 'deployDomain',
             label: i18n.t('menu-go-deploy-domain'),

electron/app/locales/en/electron.json

@@ -48,6 +48,12 @@
   "menu-go-install-operator": "Install WebLogic Kubernetes Operator",
   "menu-go-install-operator-error-title": "No Active Project Window",
   "menu-go-install-operator-error-message": "Cannot install WebLogic Kubernetes Operator since there is no active window, and therefore no project with the WebLogic Kubernetes Operator configuration to install.",
+  "menu-go-update-operator": "Update WebLogic Kubernetes Operator",
+  "menu-go-update-operator-error-title": "No Active Project Window",
+  "menu-go-update-operator-error-message": "Cannot update WebLogic Kubernetes Operator since there is no active window, and therefore no project with the WebLogic Kubernetes Operator configuration to update.",
+  "menu-go-uninstall-operator": "Uninstall WebLogic Kubernetes Operator",
+  "menu-go-uninstall-operator-error-title": "No Active Project Window",
+  "menu-go-uninstall-operator-error-message": "Cannot uninstall WebLogic Kubernetes Operator since there is no active window, and therefore no project with the WebLogic Kubernetes Operator configuration to uninstall.",
   "menu-go-deploy-domain": "Deploy WebLogic Domain to Kubernetes",
   "menu-go-deploy-domain-error-title": "No Active Project Window",
   "menu-go-deploy-domain-error-message": "Cannot deploy WebLogic domain to Kubernetes since there is no active window, and therefore no project with a WebLogic domain configuration to deploy.",
@@ -272,6 +278,7 @@
   "helm-repo-add-failed-error-message": "Unable to add Helm repo {{helmRepo}}: {{error}}",
   "helm-install-ingress-failed-error-message": "Unable to install Helm release {{name}} in Kubernetes namespace {{namespace}} using Helm chart {{helmChart}}: {{error}}",
   "helm-install-wko-failed-error-message": "Unable to install Helm release {{name}} in Kubernetes namespace {{namespace}} using Helm chart {{helmChart}}: {{error}}",
+  "helm-uninstall-wko-failed-error-message": "Unable to uninstall Helm release {{name}} in Kubernetes namespace {{namespace}} using Helm chart {{helmChart}}: {{error}}",
   "helm-upgrade-wko-failed-error-message": "Unable to upgrade Helm release {{name}} in Kubernetes namespace {{namespace}} using Helm chart {{helmChart}}: {{error}}",
   "helm-list-failed-error-message": "Helm list --all-namespaces failed: {{error}}",
   "helm-write-values-file-failed-error-message": "Unable to run helm install due to an error writing the data to a temporary file: {{error}}",