Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

documentation/3.4/content/userguide/aks/_index.md

@@ -78,7 +78,7 @@ In this section, you can configure some options about the AKS which will run Web
 | Field | Description |
 |-------|-------------|
 |Create a new AKS cluster| If set to **Yes**, the deployment will create a new AKS cluster resource in the specified resource group. If set to **No**, you have the opportunity to select an existing AKS cluster, into which the deployment is configured. Note: the offer assumes the existing AKS cluster has no WebLogic related deployments. |
-|Use latest supported AKS Kubernetes version| The currently supported version is **1.24.3**.  Oracle tracks the AKS release versions in [Supported Kubernetes versions in Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions). After a new version emerges, Oracle qualifies WLS on AKS against that version and will update the offer to that version.|
+|Use latest supported AKS Kubernetes version| The currently supported version is **1.24.3**.  Oracle tracks the AKS release versions in [Supported Kubernetes versions in Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions). After a new version emerges, Oracle qualifies WLS on AKS against that version and will update the offer to that version. Please see "WebLogic Kubernetes ToolKit Support Policy (Doc ID 2790123.1)" and "Support for Oracle Fusion Middleware on Azure and Oracle Linux (Doc ID 2914257.1)" in My Oracle Support for the Oracle support policy for WLS on Kubernetes, including AKS.|
 | Node count | The initial number of nodes in the AKS cluster. This value can be changed after deployment. For information, see [Scaling]({{< relref "/userguide/managing-domains/domain-lifecycle/scaling.md" >}}). |
 | Node size | The default VM size is 2x Standard DSv2, 2 vcpus, 7 GB memory. If you want to select a different VM size, select **Change Size**, select the size from the list (for example, A3) on the Select a VM size page, and select **Select**. For more information about sizing the virtual machine, see the [Azure documentation on Sizes](https://docs.microsoft.com/azure/cloud-services/cloud-services-sizes-specs).|
 |Enable Container insights| If selected, configure the necessary settings to integrate with Container insights. Container insights gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. Container logs are also collected. Metrics are written to the metrics store and log data is written to the logs store associated with your Log Analytics workspace. For more information, see [Container insights overview](https://aka.ms/wls-aks-container-insights).|

documentation/4.0/content/base-images/custom-images.md

@@ -506,10 +506,103 @@ to create the domain home in Domain in Image.
 
 #### Create a custom image with your model inside the image
 
-In the [Model in Image]({{< relref "/managing-domains/model-in-image/_index.md" >}})
-documentation, you will see a reference to a "base" or `--fromImage` image. You should use an image with
-the recommended security patches installed as this base image, where this image could be an OCR image or a custom image.
+{{% notice tip %}}
+This section describes an option for layering Model in Image model files on a WebLogic image.
+The preferred approach for supplying Model in Image files
+is to use [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}) instead.
+{{% /notice %}}
 
-See [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}})
-or
-[Create a custom image with patches applied](#create-a-custom-image-with-patches-applied).
+{{% notice warning %}}
+The example in this section references a base image,
+`container-registry.oracle.com/middleware/weblogic:12.2.1.4`.
+This is an OCR General Availability (GA) image
+which **does not include** the latest security patches for WebLogic Server.
+GA images are intended for single desktop demonstration and development purposes _only_.
+For all other purposes, Oracle strongly recommends using only images with the latest set of recommended patches applied,
+such as OCR Critical Patch Updates (CPU) images or custom generated images.
+See [Ensure you are using recently patched images]({{< relref "/base-images/ocr-images#ensure-you-are-using-recently-patched-images" >}}).
+{{% /notice %}}
+
+Example steps for creating a custom WebLogic image with a Model in Image file layer
+(using files from the Model in Image sample):
+
+1. To gain an overall understanding of Model in Image domains,
+   read the [Model in Image User Guide]({{< relref "/managing-domains/model-in-image/_index.md" >}})
+   and the [Model in Image Sample]({{< relref "/managing-domains/samples/domains/model-in-image/_index.md" >}}).
+   Note that the sample uses the recommended best approach,
+   auxiliary images, instead of the alternative approach, which is used in this example.
+
+1. Follow the prerequisite steps in the
+   [Model in Image Sample]({{< relref "/samples/domains/model-in-image/prerequisites.md" >}})
+   that describe how to:
+
+   - Download the operator source and its Model in Image sample
+     (including copying the sample to the suggested location, `/tmp/mii-sample`).
+   - Download the latest [WebLogic Deploy Tooling](https://github.com/oracle/weblogic-deploy-tooling/releases) (WDT)
+     and [WebLogic Image Tool](https://github.com/oracle/weblogic-image-tool/releases) (WIT) installer ZIP files
+     to your `/tmp/mii-sample/model-images` directory.
+     Both WDT and WIT are required to create your Model in Image container images.
+   - Install (unzip) the WebLogic Image Tool and configure its cache to reference your WebLogic Deploy Tooling download.
+
+1. Locate or create a base WebLogic image.
+
+   See [Obtain images from the Oracle Container Registry]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}})
+   or [Create a custom image with patches applied](#create-a-custom-image-with-patches-applied).
+
+   In the following step, you will use the `container-registry.oracle.com/middleware/weblogic:12.2.1.4` GA image.
+
+1. Build the final image using WIT while specifying the base image, target image tag, WDT installation location,
+   and WDT model file locations. For example:
+
+   First, create a model ZIP file application archive and place it in the same directory
+   where the sample model YAML file and model properties files are already staged:
+
+   ```shell
+   $ rm -f /tmp/mii-sample/model-images/model-in-image__WLS-v1/archive.zip
+   $ cd /tmp/mii-sample/archives/archive-v1
+   $ zip -r /tmp/mii-sample/model-images/model-in-image__WLS-v1/archive.zip wlsdeploy
+   ```
+
+   (The `rm -f` command is included in case there's an
+   old version of the archive ZIP file from a
+   previous run of this sample.)
+
+   Second, run the following WIT command:
+
+   ```shell
+   $ cd /tmp/mii-sample/model-images
+   ```
+   ```shell
+   $ ./imagetool/bin/imagetool.sh update \
+     --tag model-in-image:WLS-v1 \
+     --fromImage container-registry.oracle.com/middleware/weblogic:12.2.1.4 \
+     --wdtModel      ./model-in-image__WLS-v1/model.10.yaml \
+     --wdtVariables  ./model-in-image__WLS-v1/model.10.properties \
+     --wdtArchive    ./model-in-image__WLS-v1/archive.zip \
+     --wdtModelOnly \
+     --wdtDomainType WLS \
+     --chown oracle:root
+   ```
+
+   __Note__: If using a Fusion Middleware Infrastructure base image,
+   then specify a `--wdtDomainType` of `JRF` or `RestrictedJRF`,
+   `JRF-v1` instead of `WLS-v1` for the image tag,
+   and substitute each occurrence of `model-in-image__WLS-v1` with `model-in-image__JRF-v1`.
+
+1. For an example Domain YAML file that sets up Model in Image to reference the image,
+   see `/tmp/mii-sample/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml`
+   (or `./JRF/mii-initial-d1-JRF-v1.yaml` if using Fusion Middleware Infrastructure `JRF` mode).
+
+   __Notes__: 
+
+   - The default values for `domain.spec.configuration.model.wdtInstallHome` and `.modelHome`
+     reference the location of the WDT installation and model files that WIT copied into the image.
+
+   - The domain type specified in `domain.spec.configuration.model.domainType`
+     must correspond with the `--wdtDomainType` specified on the WIT command line when creating the image.
+
+   - To compare this example with an equivalent auxiliary image domain:
+     ```
+     $ diff /tmp/mii-sample/domain-resources/WLS-AI/mii-initial-d1-WLS-AI-v1.yaml \
+            /tmp/mii-sample/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml
+     ```

documentation/4.0/content/managing-domains/accessing-the-domain/status-conditions.md

@@ -143,7 +143,7 @@ Status:
 
 #### `ConfigChangesPendingRestart`
 - This condition tracks the progress of [runtime updates]({{< relref "managing-domains/model-in-image/runtime-updates">}})
-  to the WebLogic Deploy Tool model of a Model in Image domain home source type.
+  to the WebLogic Deploy Tooling model of a Model in Image domain home source type.
 - The `status` attribute is `True` if all of the following are true:
   * The Domain resource attribute
     `domain.spec.configuration.model.onlineUpdate.onNonDynamicChanges` is `CommitUpdateOnly`.

documentation/4.0/content/managing-domains/aks/_index.md

@@ -66,7 +66,7 @@ In this section, you can configure some options about the AKS which will run Web
 | Field | Description |
 |-------|-------------|
 |Create a new AKS cluster| If set to **Yes**, the deployment will create a new AKS cluster resource in the specified resource group. If set to **No**, you have the opportunity to select an existing AKS cluster, into which the deployment is configured. Note: the offer assumes the existing AKS cluster has no WebLogic related deployments. |
-|Use latest supported AKS Kubernetes version| The currently supported version is **1.24.3**.  Oracle tracks the AKS release versions in [Supported Kubernetes versions in Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions). After a new version emerges, Oracle qualifies WLS on AKS against that version and will update the offer to that version.|
+|Use latest supported AKS Kubernetes version| The currently supported version is **1.24.3**.  Oracle tracks the AKS release versions in [Supported Kubernetes versions in Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions). After a new version emerges, Oracle qualifies WLS on AKS against that version and will update the offer to that version. Please see "WebLogic Kubernetes ToolKit Support Policy (Doc ID 2790123.1)" and "Support for Oracle Fusion Middleware on Azure and Oracle Linux (Doc ID 2914257.1)" in My Oracle Support for the Oracle support policy for WLS on Kubernetes, including AKS.|
 | Node count | The initial number of nodes in the AKS cluster. This value can be changed after deployment. For information, see [Scaling]({{< relref "/managing-domains/domain-lifecycle/scaling.md" >}}). |
 | Node size | The default VM size is 2x Standard DSv2, 2 vcpus, 7 GB memory. If you want to select a different VM size, select **Change Size**, select the size from the list (for example, A3) on the Select a VM size page, and select **Select**. For more information about sizing the virtual machine, see the [Azure documentation on Sizes](https://docs.microsoft.com/azure/cloud-services/cloud-services-sizes-specs).|
 |Enable Container insights| If selected, configure the necessary settings to integrate with Container insights. Container insights gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. Container logs are also collected. Metrics are written to the metrics store and log data is written to the logs store associated with your Log Analytics workspace. For more information, see [Container insights overview](https://aka.ms/wls-aks-container-insights).|

documentation/4.0/content/managing-domains/choosing-a-model/_index.md

@@ -13,28 +13,36 @@ This document describes the domain home source types for deploying a domain, and
 
 When using the operator to start WebLogic Server instances from a domain, you have the choice of the following WebLogic domain home source types:
 
- - **[Domain in PV]({{< relref "/samples/domains/domain-home-on-pv/_index.md" >}})**:
-   - Set the domain resource `domain.spec.domainHomeSourceType` attribute to `PersistentVolume`.
-   - Supply a WebLogic installation in an image and supply WebLogic configuration as a domain home in a persistent volume.
-   - Supply WebLogic applications in the persistent volume.
-   - Mutate WebLogic configuration using WLST, the WebLogic Server Administration Console, or [configuration overrides]({{< relref "/managing-domains/configoverrides/_index.md" >}}) supplied in a Kubernetes ConfigMap.
-
- - **[Domain in Image]({{< relref "/samples/domains/domain-home-in-image/_index.md" >}})**:
-   - Set the domain resource `domain.spec.domainHomeSourceType` attribute to `Image`.
-   - Supply a WebLogic installation in an image and supply WebLogic configuration as a domain home layered on this image.
-   - Supply WebLogic applications layered on the installation image.
-   - Mutate WebLogic configuration by supplying a new image and rolling, or by configuration overrides supplied in a Kubernetes ConfigMap.
-
  - **[Model in Image]({{< relref "/samples/domains/model-in-image/_index.md" >}})**:
    - Set the domain resource `domain.spec.domainHomeSourceType` attribute to `FromModel`.
-   - Supply a WebLogic installation in an image and supply WebLogic configuration in one of three ways:
+   - Supply a WebLogic installation in an image and supply a WebLogic configuration in one of three ways:
+     - As WDT model YAML file supplied in separate
+       [auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
      - As WebLogic Deployment Tool (WDT) model YAML file layered on the WebLogic installation image.
-     - As WDT model YAML file supplied in separate [auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
      - As WDT model YAML file in a Kubernetes ConfigMap.
    - Supply WebLogic applications in one of two ways:
-     - Layered on the installation image.
      - In auxiliary images.
-   - Mutate WebLogic configuration by supplying a new image and rolling, or [model updates]({{< relref "/managing-domains/model-in-image/runtime-updates.md" >}}) supplied in a Kubernetes ConfigMap.
+     - Layered on the installation image.
+   - Mutate the WebLogic configuration by supplying a new image and rolling,
+     or [model updates]({{< relref "/managing-domains/model-in-image/runtime-updates.md" >}})
+     supplied in a Kubernetes ConfigMap.
+
+ - **[Domain in Image]({{< relref "/samples/domains/domain-home-in-image/_index.md" >}})**:
+   - Set the domain resource `domain.spec.domainHomeSourceType` attribute to `Image`.
+   - Supply a WebLogic installation in an image and supply a WebLogic configuration as a domain home layered on this image.
+   - Supply WebLogic applications layered on the installation image.
+   - Mutate the WebLogic configuration by supplying a new image and rolling,
+     or by [configuration overrides]({{< relref "/managing-domains/configoverrides/_index.md" >}})
+     supplied in a Kubernetes ConfigMap.
+
+ - **[Domain in PV]({{< relref "/samples/domains/domain-home-on-pv/_index.md" >}})**:
+   - Set the domain resource `domain.spec.domainHomeSourceType` attribute to `PersistentVolume`.
+   - Supply a WebLogic installation in an image and supply a WebLogic configuration as a domain home in a persistent volume.
+   - Supply WebLogic applications in the persistent volume.
+   - Mutate the WebLogic configuration using WLST,
+     the WebLogic Server Administration Console,
+     or [configuration overrides]({{< relref "/managing-domains/configoverrides/_index.md" >}})
+     supplied in a Kubernetes ConfigMap.
 
 Note that you can use different domain home types for different domains; there's no restriction on having domains with different domain home types in the same Kubernetes cluster or namespace.