Merge branch 'main' into develop

Author: robertpatrick

README.md

@@ -14,6 +14,8 @@ The WKT UI provides a graphical user interface that wraps the WKT tools, Docker,
 a Linux container image to use to run the domain, and setting up and deploying the software and configuration
 necessary to deploy and access the domain in your Kubernetes cluster.
 
+**NOTE**: The WKT UI application is built using the Electron framework and as such, we support only the platforms and versions supported by [Electron](https://www.electronjs.org/docs/latest/tutorial/support#supported-platforms).  For example, because of the Electron requirement for Fedora 24 or newer, we support _only_ versions 8.0 and higher of Oracle Linux, RedHat Linux, and CentOS Linux.
+
 
 ## About the Documentation
 

documentation/1.1/content/navigate/image.md

@@ -24,20 +24,26 @@ in a Kubernetes environment using the [WebLogic Image Tool](https://oracle.githu
 
 ### Design View
 The `Design View` helps you specify the necessary data needed to run the WebLogic Image Tool to build an image for
-running the WebLogic domain with all resources configured and applications deployed. The `Design View` page is divided into `Primary Image` and `Auxiliary Image` pages.
-Auxiliary images are available for the "Model in Image" [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}) _only_.
+running the WebLogic domain.
 
-- `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.
+Use the `Design View` page to specify whether to create a new or use an existing (the default) `Primary Image` and
+whether or not (the default) to use an `Auxiliary Image` (an existing one or create a new one).
+**Note** that auxiliary images are available for the "Model in Image" [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}) _only_.
 
-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
+
+- **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.
+
+
+{{< himg "Primary image diagram" "images/primary-image.png" "Auxiliary image diagram" "images/auxiliary-image.png" >}}
+
+The primary image is the one used for running the domain and the auxiliary image 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,
-for "Model in Image" domains only, create a new (the default) or use an existing `Auxiliary Image`.
-The `Design View` page has the following basic panes and a few advanced panes.
-Note that _not all_ the fields described for the `Primary Image` are relevant for an `Auxiliary Image`. The exceptions are noted.
+If you select to create a new primary image, you'll see the following basic panes and a few advanced panes on the `Primary Image` Design View page.
+If you select to create a new auxiliary image, you must select the `Auxiliary Image` Design View page, to configure it.
+Note that _not all_ the fields described in the following sections for the `Primary Image`, are relevant for an `Auxiliary Image`. The exceptions are noted.
 
 - [Target Image Name and Registry Credentials](#target-image-name-and-registry-credentials)
 - [Base Image to Use](#base-image-to-use)

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

@@ -80,7 +80,9 @@ The following sections describe the other panes that support configuring the gen
 - [Domain-Wide Server Settings](#domain-wide-server-settings)
 
 #### Primary Image to Use for the Domain
-This pane focuses on the container primary image to use to run the WebLogic Server domain in a container.   
+This pane focuses on the container primary image to use to run the WebLogic Server domain in a container. If you select `Create a New Primary Image`,
+then click `Go To Create Primary Image Page` to configure the image. For detailed information, see the [Image]({{< relref "/navigate/image.md" >}}) section.
+
 - When using either "Model in Image" or "Domain in Image" [domain location]({{< relref "/navigate/project-settings#choosing-a-domain-location" >}}), the `Primary Image Tag` field is read-only; its value is set using the
 `Image Tag` field in the `Image` section.  
 - In the case of "Domain in PV", the `Image Tag` field is not read-only and _is_
@@ -103,6 +105,10 @@ whether to use an existing image pull secret or create a new one.  Specify the i
 
 #### Auxiliary Image to Use for the Domain
 
+Under `Auxiliary Image Configuration`, use the radio buttons to specify whether or not to use an Auxiliary Image (an existing one) or create a new one (the default).
+If you select `Create a New Auxiliary Image`, then click `Go To Create Auxiliary Image Page` to configure the image. For detailed information,
+see the [Image]({{< relref "/navigate/image.md" >}}) section.
+
 For "Model in Image" domains only, this pane focuses on the container auxiliary image to use for the domain.
 - The `Auxiliary Image Tag` field is read-only; its value is set using the
 `Auxiliary Image Tag` field in the `Auxiliary Image` page of the `Image` section.

documentation/1.1/content/release/_index.md

@@ -0,0 +1,64 @@
++++
+title = "Release Notes"
+date = 2022-01-30T12:48:00-05:00
+weight = 5
+pre = "<b> </b>"
++++
+
+### Changes in Release 1.1.1
+- [Major New Features](#major-new-features)
+- [Other Changes](#other-changes)
+- [Bugs Fixes](#bug-fixes)
+- [Known Issues](#known-issues)
+
+#### Major New Features
+No new features.
+
+#### Other Changes
+- Revamped the Ingress Route editing mechanism:
+  - Added busy dialog while fetching existing service data from the domain's Kubernetes namespace prior to opening the route edit dialog.
+  - Added placeholders to the `Target Service` and `Target Port` fields to clarify the current state of these fields when no value is selected.
+  - Added logic to reset the `Target Port` field selection when the `Target Service` field changes and the selected port is not valid for the new service selected.
+- Reworked the Image page and related fields on the Domain page to improve usability.  With these changes, a user not needing to create new images can bypass the Image page completely.
+  - Converted `Use Auxiliary Image` and `Create New Auxiliary Image` switches to radio buttons to make the three options more clear.
+  - Moved the `Image Tag` and `Image Registry Address` fields from the Image page tabs to the Domain page when not creating a new image.
+  - Replicated the `Create New Primary Image` and `Auxiliary Image Configuration` controls from the Image page to the Domain page.
+  - Added navigation buttons on the Domain page to direct the user to go back to the Image page when creating a new image.
+- Bundled WebLogic Deploy Tooling 2.1.0. See [WDT release notes](https://github.com/oracle/weblogic-deploy-tooling/releases/tag/release-2.1.0) for details.
+- Reworked Model actions to work better for `Domain in Image` and `Domain in PV` use cases.
+  - Enhanced Prepare Model action to use the new target types added in WebLogic Deploy Tooling 2.1.0 so that Prepare Model works properly for `Model in Image`, `Domain in Image`, and `Domain in PV` use cases.
+  - Removed `Domain in PV` check that was previously preventing both `Validate Model` and `Prepare Model` actions from being used.
+- Enhanced Domain page `Cluster` table to be editable when using `Domain in PV` to support use cases where the project has or doesn't have a model.
+- Converted all `aria-label` fields to use the i18n resource bundle.
+- Removed `webui` unit tests from the installers.
+
+#### Bug Fixes
+- Resolved issue with "Save As" when saving project file in a different directory.
+- Resolved issue with "Save As" where the project was losing an entry for the archive file if no pending changes exist.
+- Resolved issue where project file to window mapping was causing unnecessary reassigning of the credential manager.
+- Added additional RPM installer dependencies to try to resolve installation issues when on a Linux VM not being used as a desktop machine.
+- Added a native macOS ICNS icon to resolve mangled icon on macOS.
+- Resolved issue with existing ingress route detection to eliminate overwrite warnings when route does not exist.
+
+### 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.
+
+- On Linux, the application depends on libGL being installed.  libGL is not currently listed in the dependencies list
+  for the `rpm` (or `deb`) installers.  Therefore, you will need to install libGL using your package manager.
+  For example:
+  ```
+    sudo yum install libGL
+  ```
+
+- 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).
+
+- The application is limited to working with archive files whose size is less than 2 GB.

documentation/1.1/content/release notes/_index.md renamed to documentation/1.1/content/release/release-1.1.0.md

@@ -1,21 +1,26 @@
-+++
-title = "Release Notes"
-date = 2022-01-30T12:48:00-05:00
-weight = 5
-pre = "<b> </b>"
-+++
+---
+title: "Release 1.1.0"
+date: 2019-02-22T15:44:42-05:00
+draft: false
+weight: 2
+description: "Install the WKT UI application and check for updates."
+---
 
 ### Changes in Release 1.1.0
-This release contains the following changes and bug fixes.
+- [Major New Features](#major-new-features)
+- [Other Changes](#other-changes)
+- [Bugs Fixes](#bug-fixes)
+- [Known Issues](#known-issues)
+
 
 #### Major New Features
 - Updated macOS environment control to specify extra environment settings to pass down to Docker/Podman, kubectl, and Helm invocations.
 - Bundling WebLogic Deploy Tooling 2.0.0. See [WDT release notes](https://github.com/oracle/weblogic-deploy-tooling/releases/tag/release-2.0.0) for details.
 - New Validate Model action that leverages WDT 2.0 changes to validate the model files and reports any validation errors it finds.
 - Updated Prepare Model action that leverages WDT 2.0 changes to improve model preparation for deploying with WebLogic Kubernetes Operator.
 - Added support for splitting the FMW (WebLogic or FMW Infrastructure) and WDT model images (also known as auxiliary images).
-  - New Create Auxiliary Image action to create an auxiliary image.
-  - New Push Auxiliary Image action to push an auxiliary image to an image registry.
+    - New Create Auxiliary Image action to create an auxiliary image.
+    - New Push Auxiliary Image action to push an auxiliary image to an image registry.
 - New Update Operator action to apply changes such as a version upgrade to an existing WebLogic Kubernetes Operator installation.
 - New Uninstall Operator action to uninstall the WebLogic Kubernetes Operator installation and optionally, its Kubernetes namespace.
 - New Undeploy Domain action to undeploy an existing domain  and optionally, its Kubernetes namespace.
@@ -52,13 +57,13 @@ This release contains the following changes and bug fixes.
 - Worked around macOS-specific Electron issue that caused the model editor to not receive a blur event when using the
   application menus.
 
-### Known Issues in Release 1.1.0
+#### Known Issues
 
-- When running the WKT UI application on Windows, the image builder tool (Docker or Podman) also must be directly 
+- 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 
+  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.
 

documentation/1.1/content/setup/prerequisites.md

@@ -29,7 +29,8 @@ These include:
 - `openssl` - Used to generate an X.509 TLS certificate for ingress routes, should you ask the application
   to generate one for you.
 
-The WKT UI application is built using the Electron framework and as such, we support only the platforms and versions supported by [Electron](https://www.electronjs.org/docs/latest/tutorial/support#supported-platforms).  For example, because of the Electron requirement for Fedora 24 or newer, we support only versions 8.0 and higher of Oracle Linux, RedHat Linux, and CentOS Linux.
+{{% notice note %}} The WKT UI application is built using the Electron framework and as such, we support only the platforms and versions supported by [Electron](https://www.electronjs.org/docs/latest/tutorial/support#supported-platforms).  For example, because of the Electron requirement for Fedora 24 or newer, we support _only_ versions 8.0 and higher of Oracle Linux, RedHat Linux, and CentOS Linux.
+{{% /notice %}}
 
 In addition to these local software dependencies, you will need a Kubernetes cluster to which you can deploy your
 containerized WebLogic Server domain and its applications.  If you do not already have a model, then you can either write
@@ -45,22 +46,22 @@ with a WebLogic domain that can be used to discover the model from the domain.
    https://support.oracle.com/knowledge/Oracle%20Linux%20and%20Virtualization/2717454_1.html
 
    - For running the WKT UI on a remote machine without desktop environment and accessing it through X forwarding, you need to ensure X forwarding is working properly.  For example,
-  
+
     ```
     sudo dnf install xterm
     logout
     ssh -X ...
     xterm
     ```
-  
+
 - For Debian-based systems, such as Ubuntu and Debian:
 
    - For storing credentials in the OS native credentials store, you must have a desktop environment. If your system does not have a graphical desktop environment, then you can install one; for example, installing GNOME on Ubuntu 20x:
    ```
    sudo apt install gnome-session gdm3
    sudo reboot
    ```
-  
+
   - For running the WKT UI on a remote machine without desktop environment and accessing it through X forwarding, you need to ensure X forwarding is working properly.  For example,
 
     ```

documentation/1.1/layouts/shortcodes/img.html

@@ -0,0 +1 @@
+<img src="{{ .Get 1 | absURL }}" alt="{{ .Get 0 }}">

documentation/1.1/static/images/auxiliary-image.png

@@ -72,7 +72,6 @@ Les paramètres de configuration du mermaid peuvent également être définis su
 > À la page "Architecture", vous avez besoin d'un diagramme de classe. Vous pouvez régler les paramètres de mermaid localement pour ne charger que la sirène sur cette page (pas sur les autres).
 
 Vous pouvez également désactiver mermaid pour des pages spécifiques tout en l'activant globalement.
-<<<<<<< HEAD
 
 ## Configuration du bouton Accueil
 
@@ -106,5 +105,3 @@ landingPageName = "<i class='fas fa-home'></i> Home"
 Le bouton d'accueil va ressembler à ceci:
 
 ![Default Home Button](/en/basics/configuration/images/home_button_defaults.jpg?width=100%)
-=======
->>>>>>> 023fe7ef2b4c45fe66ac932d9e25d09f30b74a4e