Merge branch 'main' into ssl-enhancement

Author: jshum2479

documentation/staging/content/navigate/image.md

@@ -30,7 +30,8 @@ Auxiliary images are available for the "Model in Image" [domain location]({{< re
 - `Primary Image` - The image containing the Oracle Fusion Middleware software. It is used as the basis of all containers that run WebLogic Servers for the domain.
 - `Auxiliary Image` - The image that supplies the WebLogic Deploy Tooling software and the model files. At runtime, the auxiliary image's content is merged with the primary image's content.
 
-One primary image can be reused for hundreds of domains whereas an auxiliary image is domain-specific. When using auxiliary images,
+The primary image is the one used for running the domain and the auxiliary contains the data that defines the domain. One primary image can be
+reused for hundreds of domains whereas an auxiliary image is domain-specific. When using auxiliary images,
 the primary image contains the OS, JDK, and FMW software installations; the auxiliary image supplies the specifics for a single domain.
 
 Use the `Design View` page to create a new or use an existing (the default) `Primary Image` and,
@@ -113,6 +114,11 @@ other installers' version number fields, the best practice it to use the actual
 latest capabilities, many of which are exposed by this application.  As such, using the latest version is strongly
 recommended.
 
+{{% notice note %}} For "Model in Image" or "Domain in Image" [domain locations]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}),
+when building your primary or auxiliary image, we highly recommend using WDT 2.0 to take advantage of enhanced capabilities that reduce the chance of deploy-time errors created due to a bad model.    
+{{% /notice %}}
+
+
 #### Patch Oracle Home
 **NOTE**: This pane is relevant for `Primary Images` only. Oracle strongly recommends patching all Oracle Fusion Middleware installations with the latest Patch Set Updates (PSUs)
 and other recommended patches to ensure that the latest security fixes are applied.  This pane configures the WebLogic
@@ -194,8 +200,8 @@ the script itself.  This change is left as an exercise for you because different
 existing standards for securely handling such credentials.
 
 ### Create Images
-The `Create Primary Image` and `Create Auxiliary Image` actions invoke the [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/) to
-create a new container image for running a WebLogic domain in a Kubernetes environment.  You can access these actions using
+`Create Primary Image` and `Create Auxiliary Image` invoke the [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/) to
+create a new container image for running a WebLogic domain in a Kubernetes environment.  You access these actions using
 the `Create Primary Image` or `Create Auxiliary Image` button on the `Image` page or from the `Go` menu.
 
 At a high level, the action performs the following steps:
@@ -208,8 +214,8 @@ At a high level, the action performs the following steps:
    [Create](https://oracle.github.io/weblogic-image-tool/userguide/tools/create-image/) command.
 
 ### Push Images
-The `Push Primary Image` and `Push Auxiliary Image` actions use the specified Image Builder program to upload (that is, push) the newly-built image
-to the image registry specified by its image tag.  You can access these actions by using the `Push Primary Image` or `Push Auxiliary Image` button on the `Image`
+`Push Primary Image` and `Push Auxiliary Image` use the specified Image Builder program to upload (that is, push) the newly-built image
+to the image registry specified by its image tag.  You access these actions by using the `Push Primary Image` or `Push Auxiliary Image` button on the `Image`
 page or from the `Go` menu.
 
 At a high level, the action performs the following steps:

documentation/staging/content/navigate/kubernetes/k8s-ingress-controller.md

@@ -15,6 +15,7 @@ description: "Install and configure an ingress controller."
 - [Code View](#code-view)
 - [Install Ingress Controller](#install-ingress-controller)
 - [Update Ingress Routes](#update-ingress-routes)
+- [Uninstall Ingress Controller](#uninstall-ingress-controller)
 
 ### Ingress Controller
 This section supports two distinct functions related to an ingress controller.  First, it supports installing an ingress
@@ -105,10 +106,16 @@ existing standards for securely handling such credentials.
 
 ### Install Ingress Controller
 `Install Ingress Controller` creates any namespace and secret specified and runs the ingress controller's Helm
-chart to install the ingress controller.  You can access it by using the `Install Ingress Controller` button on the
-`Ingress Controller` page or `Go` > `Install Ingress Controller`.
+chart to install the ingress controller.  You access this action by using the `Install Ingress Controller` button on the
+`Ingress Controller` page or the `Go` > `Install Ingress Controller` menu item.
 
 ### Update Ingress Routes
-`Update Ingress Routes` creates the TLS secret, if needed, and adds or updates the specified ingress routes. You can access it
+`Update Ingress Routes` creates the TLS secret, if needed, and adds or updates the specified ingress routes. You access this action
 by using the `Update Ingress Routes` button on the `Ingress Controller` page or
-`Go` > `Update Ingress Routes to Domain`.
+the `Go` > `Update Ingress Routes to Domain` menu item.
+
+### Uninstall Ingress Controller
+`Uninstall Ingress Controller` uses the `helm uninstall` command to remove all the ingress resources
+and uninstall the ingress controller. In addition, you can choose whether to also delete the corresponding namespace.
+You access these actions by using the `Uninstall Ingress Controller` button on the
+`Ingress Controller` page or the `Go` > `Uninstall Ingress Controller` menu item.

documentation/staging/content/navigate/kubernetes/k8s-weblogic-domain.md

@@ -21,6 +21,7 @@ description: "Create and deploy the Kubernetes custom resource for the WebLogic
 - [Prepare Model](#prepare-model)
 - [Deploy Domain](#deploy-domain)
 - [Get Domain Status](#get-domain-status)
+- [Undeploy Domain](#undeploy-domain)
 
 ### WebLogic Domain
 The `WebLogic Domain` section provides support for creating and deploying the Kubernetes custom resource for the WebLogic domain as
@@ -230,8 +231,8 @@ surfaced here because the `Clusters` pane of the `Design View` is populated only
 
 ### Deploy Domain
 `Deploy Domain` creates the Domain custom resource object and any of its dependent objects (for example,
-namespace, secrets, ConfigMap) in Kubernetes.  You can access it by using the `Deploy Domain` button on the
-`WebLogic Domain` page or `Go` > `Deploy WebLogic Domain to Kubernetes`.  As previously
+namespace, secrets, ConfigMap) in Kubernetes.  You access this action by using the `Deploy Domain` button on the
+`WebLogic Domain` page or the `Go` > `Deploy WebLogic Domain to Kubernetes` menu item.  As previously
 mentioned, this action also updates the operator configuration, if needed, and reruns the operator Helm chart to ensure
 that the new namespace is manageable by the WebLogic Kubernetes Operator configured for this project.  
 
@@ -244,3 +245,9 @@ provides the current status of the last `Deploy Domain` action.
 To view the current status of the last domain deployment, use the `Get Domain Status` button or the
 `Go` > `Get WebLogic Domain Status`.  This action retrieves and displays the domain deployment
 status, as provided by the WebLogic Kubernetes Operator.
+
+### Undeploy Domain
+`Undeploy Domain` removes the Kubernetes custom resource for the WebLogic domain and its
+dependent objects in Kubernetes. In addition, you can choose whether to also delete the corresponding namespace.
+You access these actions by using the `Undeploy Domain` button on the
+`WebLogic Domain` page or the `Go` > `Undeploy WebLogic Domain to Kubernetes` menu item.

documentation/staging/content/navigate/kubernetes/k8s-wko.md

@@ -20,6 +20,8 @@ description: "Install the WebLogic Kubernetes Operator in the target Kubernetes
     - [Java Logging](#java-logging)
 - [Code View](#code-view)
 - [Install Operator](#install-operator)
+- [Update Operator](#update-operator)
+- [Uninstall Operator](#uninstall-operator)
 
 ### WebLogic Kubernetes Operator
 This section provides support for installing the WebLogic Kubernetes Operator (the "operator") in the target Kubernetes cluster.
@@ -164,9 +166,9 @@ the script itself.  This change is left as an exercise for you because different
 existing standards for securely handling such credentials.
 
 ### Install Operator
-The `Install Operator` action installs the WebLogic Kubernetes Operator in the target Kubernetes cluster. 
-You can access it by using the `Install Operator` button on the
-`WebLogic Operator` page or `Go` > `Install WebLogic Kubernetes Operator`.
+`Install Operator` installs the WebLogic Kubernetes Operator in the target Kubernetes cluster.
+You access this action by using the `Install Operator` button on the
+`WebLogic Operator` page or the `Go` > `Install WebLogic Kubernetes Operator` menu item.
 
 At a high level, `Install Operator` performs the following steps:
 
@@ -177,3 +179,24 @@ At a high level, `Install Operator` performs the following steps:
 5. Creates the operator image pull secret, if needed.
 6. Adds the latest operator Helm chart to the local Helm repository.
 7. Runs Helm to install the operator using the specified configuration.
+
+### Update Operator
+
+`Update Operator` updates the settings on a running WebLogic Kubernetes Operator by using the `helm upgrade` command.
+You access this action by using the `Update Operator` button on the
+`WebLogic Operator` page or the `Go` > `Update WebLogic Kubernetes Operator` menu item.
+
+`Update Operator` applies all the changes to the operator that you have specified on the page. For example,
+you can change the operator image version, the domain namespace selection strategy, Java logging level,
+or the value of any field in the WebLogic Kubernetes Operator section.   
+
+### Uninstall Operator
+
+`Uninstall Operator` uses the `helm uninstall` command to remove the WebLogic Kubernetes Operator and its associated
+resources from the Kubernetes cluster. In addition, you can choose whether to also delete the corresponding namespace.
+You access these actions by using the `Uninstall Operator` button on the
+`WebLogic Operator` page or the `Go` > `Uninstall WebLogic Kubernetes Operator` menu item.
+
+Note that if you uninstall an operator, then any domains that it is managing will continue running; however,
+any changes to a domain resource that was managed by the operator will not be detected or automatically handled,
+and, if you want to clean up such a domain, then you will need to manually delete all of the domain's resources (domain, pods, services, and such).

documentation/staging/content/release notes/_index.md

@@ -5,6 +5,14 @@ weight = 5
 pre = "<b> </b>"
 +++
 
+### Recent Changes
+
+- For "Model in Image" domains, added the ability to configure and push an auxiliary image.
+- Added these capabilities:
+   - Update and uninstall the WebLogic Kubernetes Operator
+   - Uninstall the ingress controller
+   - Undeploy the WebLogic domain
+
 ### Known Issues
 
 - When running the WKT UI application on Windows, the image builder tool (docker or podman) also must be directly executable in Windows.  For example, there is currently no support for running the WKT UI application in Windows and running podman under the Windows Subsystem for Linux (WSL2).  However, running Docker Desktop for Windows with a WSL2 backend _is_ fully supported because the `docker` command is executable directly in Windows (without having to call WSL2). If you need to use podman on Windows, then refer to the podman blog entries at https://podman.io/blogs/2021/09/06/podman-on-macs.html and https://podman.io/blogs/2020/09/02/running_windows_or_mac.html for more information about downloading, installing, and configuring the Windows Remote Client.
@@ -16,7 +24,7 @@ pre = "<b> </b>"
 
 - When trying to run the application on a Linux machine and display it on a Windows machine, do not use the Xming X server.  There appears to be a bug (presumably with their OpenGL support) that prevents applications using Electron 13.x or later from working (for example, Microsoft VS Code doesn't work either).
 
-- On Linux when running the application that was installed using the `rpm` or `deb` installers, the following error messages will appear in the log.  These are expected and can safely be ignored.  The errors are due to the fact that the electron-updater package being used to perform application updates only supports upgrading Linux applications when run using an `AppImage` binary.
+- On Linux, when running the application that was installed using the `rpm` or `deb` installers, the following error messages will appear in the log.  These are expected and can safely be ignored.  The errors are due to the fact that the electron-updater package being used to perform application updates supports only upgrading Linux applications when run using an `AppImage` binary.
   ```
     info: Checking for update
     error: Error: Error: ENOENT: no such file or directory, open '/opt/WebLogic Kubernetes Toolkit UI/resources/app-update.yml'

electron/app/js/imageBuilderUtils.js

@@ -137,14 +137,41 @@ async function doPushImage(currentWindow, stdoutChannel, stderrChannel, imageBui
 
 function getDockerEnv(httpsProxyUrl, bypassProxyHosts) {
   let env = {
-    DOCKER_BUILDKIT: '0'
+    DOCKER_BUILDKIT: '0',
+    // podman relies on the PATH including other executables (e.g., newuidmap)...
+    PATH: process.env.PATH
   };
 
+  // Docker-specific environment variables that should be passed on
+  if (process.env.DOCKER_HOST) {
+    env['DOCKER_HOST'] = process.env.DOCKER_HOST;
+  }
+  if (process.env.DOCKER_TLS_VERIFY) {
+    env['DOCKER_TLS_VERIFY'] = process.env.DOCKER_TLS_VERIFY;
+  }
+  if (process.env.DOCKER_CERT_PATH) {
+    env['DOCKER_CERT_PATH'] = process.env.DOCKER_CERT_PATH;
+  }
+
+  // podman-specific environment variables that should be passed on
+  if(process.env.CONTAINER_HOST) {
+    env['CONTAINER_HOST'] = process.env.CONTAINER_HOST;
+  }
+  if (process.env.STORAGE_DRIVER) {
+    env['STORAGE_DRIVER'] = process.env.STORAGE_DRIVER;
+  }
+  if (process.env.STORAGE_OPTS) {
+    env['STORAGE_OPTS'] = process.env.STORAGE_OPTS;
+  }
+
+  // proxy-related environment variables
   if (httpsProxyUrl) {
     env['HTTPS_PROXY'] = httpsProxyUrl;
+    env['https_proxy'] = httpsProxyUrl;
   }
   if (bypassProxyHosts) {
     env['NO_PROXY'] = bypassProxyHosts;
+    env['no_proxy'] = bypassProxyHosts;
   }
 
   if (!osUtils.isWindows()) {
@@ -159,6 +186,7 @@ function getDockerEnv(httpsProxyUrl, bypassProxyHosts) {
 module.exports = {
   doLogin,
   doPushImage,
+  getDockerEnv,
   validateImageBuilderExecutable,
   validateImageExistsLocally
 };

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/kubectlUtils.js

@@ -601,13 +601,14 @@ async function apply(kubectlExe, fileData, options) {
 }
 
 function getKubectlEnvironment(options, httpsProxyUrl, bypassProxyHosts) {
-  const env = {};
+  const env = {
+    PATH: process.env.PATH
+  };
   if (options) {
     if (options.kubeConfig && Array.isArray(options.kubeConfig) && options.kubeConfig.length > 0) {
       env['KUBECONFIG'] = options.kubeConfig.join(path.delimiter);
       getLogger().debug('Set KUBECONFIG environment variable to %s', env['KUBECONFIG']);
     }
-    env['PATH'] = process.env.PATH;
     if (options.extraPathDirectories && Array.isArray(options.extraPathDirectories) && options.extraPathDirectories.length > 0) {
       env['PATH'] = env['PATH'] + path.delimiter + options.extraPathDirectories.join(path.delimiter);
     }

electron/app/js/project.js

@@ -356,6 +356,14 @@ async function _openProjectFile(targetWindow, projectFileName) {
 }
 
 async function _saveProjectFile(targetWindow, projectFile, projectContents) {
+  // Just in case the name or uuid were empty, make sure that they have a proper value.
+  if (!projectContents.name) {
+    projectContents.name = _generateProjectName(projectFile);
+  }
+  if (!projectContents.uuid) {
+    projectContents.uuid = _generateProjectUuid();
+  }
+
   return new Promise((resolve, reject) => {
     _getCredentialManagerForSavingProject(targetWindow, projectContents)
       .then(credentialManager => {

electron/app/js/witCreate.js

@@ -11,24 +11,15 @@ const { getLogger } = require('./wktLogging');
 const { getImagetoolShellScript } = require('./wktTools');
 const { getHttpsProxyUrl, getBypassProxyHosts } = require('./userSettings');
 const { executeChildShellScript } = require('./childProcessExecutor');
+const { getDockerEnv } = require('./imageBuilderUtils');
 
 async function createImage(currentWindow, stdoutChannel, stderrChannel, createConfig) {
   const httpsProxyUrl = getHttpsProxyUrl();
   const bypassProxyHosts = getBypassProxyHosts();
 
   const imageToolScript = getImagetoolShellScript();
   const [ args, argsContainCredentials ] = buildArgumentsListForCreate(createConfig, httpsProxyUrl);
-  const env = {
-    JAVA_HOME: createConfig.javaHome,
-    DOCKER_BUILDKIT: '0',
-    WLSIMG_BLDDIR: app.getPath('temp')
-  };
-  if (httpsProxyUrl) {
-    env['HTTPS_PROXY'] = httpsProxyUrl;
-  }
-  if (bypassProxyHosts) {
-    env['NO_PROXY'] = bypassProxyHosts;
-  }
+  const env = getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts);
 
   const result = {
     isSuccess: true
@@ -61,18 +52,7 @@ async function createAuxImage(currentWindow, stdoutChannel, stderrChannel, creat
 
   const imageToolScript = getImagetoolShellScript();
   const args = buildArgumentsListForCreateAuxImage(createConfig, httpsProxyUrl);
-  const env = {
-    JAVA_HOME: createConfig.javaHome,
-    DOCKER_BUILDKIT: '0',
-    WLSIMG_BLDDIR: app.getPath('temp')
-  };
-  if (httpsProxyUrl) {
-    env['HTTPS_PROXY'] = httpsProxyUrl;
-  }
-  if (bypassProxyHosts) {
-    env['NO_PROXY'] = bypassProxyHosts;
-  }
-
+  const env = getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts);
   const result = {
     isSuccess: true
   };
@@ -95,6 +75,13 @@ async function createAuxImage(currentWindow, stdoutChannel, stderrChannel, creat
   });
 }
 
+function getCreateEnvironment(createConfig, httpsProxyUrl, bypassProxyHosts) {
+  const env = getDockerEnv(httpsProxyUrl, bypassProxyHosts);
+  env['JAVA_HOME'] = createConfig.javaHome;
+  env['WLSIMG_BLDDIR'] = app.getPath('temp');
+  return env;
+}
+
 function buildArgumentsListForCreate(createConfig, httpsProxyUrl) {
   const args = [ 'create' ];