Merge remote-tracking branch 'origin/main' into cleanup-persistent-storage-and-README

Author: ankedia

.github/release.yml

@@ -0,0 +1,20 @@
+# .github/release.yml
+# Template for release notes (used by .github/workflows/release.yml)
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+      - dependencies
+    authors:
+      - dependabot
+  categories:
+    - title: Major Changes
+      labels:
+        - breaking-change
+    - title: Additional Features
+      labels:
+        - enhancement
+    - title: Bug Fixes
+      labels:
+        - "*"

.github/workflows/publish-gh-pages.yml

@@ -52,6 +52,9 @@ jobs:
           
           cd $GITHUB_WORKSPACE/branch-4.0/documentation
           echo "Building documentation for latest minor version..."
+          latest_tag=$(git ls-remote https://github.com/oracle/weblogic-kubernetes-operator.git --h --sort origin "refs/tags/v*" | cut -f2 | grep v4.0 | tail -1 | cut -c12-)
+          echo "Latest tag is $latest_tag..."
+          echo $latest_tag >| $GITHUB_WORKSPACE/branch-4.0/documentation/site/layouts/shortcodes/latestVersion.html
           hugo -s site -d "$GITHUB_WORKSPACE/WORK" -b https://oracle.github.io/weblogic-kubernetes-operator
           echo "Copying static files into place..."
           cp -R domains "$GITHUB_WORKSPACE/WORK"

.github/workflows/release.yml

@@ -0,0 +1,100 @@
+name: Release
+on:
+  push:
+    tags:
+      - v*
+
+env:
+  REGISTRY: ghcr.io
+  BASE_IMAGE_NAME: ghcr.io/oracle/weblogic-kubernetes-operator
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Set environmental variables"
+        run: |
+          VERSION=${GITHUB_REF_NAME#v}
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "IMAGE_NAME=${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:$VERSION" >> $GITHUB_ENV
+
+      - name: Checkout branch
+        uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.PUBLISH_SECRET }}
+        run: mvn clean package -Dtag=${{ env.VERSION }}
+
+      - name: Create Draft Release
+        id: draft-release
+        run: |
+          echo 'PR_URL<<EOF' >> $GITHUB_ENV
+          gh release create ${{ github.ref_name }} \
+            --draft \
+            --generate-notes \
+            --target release/4.1 \
+            --title 'Operator ${{ env.VERSION }}' \
+            --repo https://github.com/oracle/weblogic-kubernetes-operator
+          echo 'EOF' >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push container image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ env.IMAGE_NAME }}
+
+      - name: Checkout gh-pages
+        uses: actions/checkout@v3
+        with:
+          ref: gh-pages
+          path: gh-pages
+          token: ${{ secrets.PUBLISH_SECRET }}
+
+      - name: Generate and publish Helm chart
+        run: |
+          curl -fL -o helm.tar.gz "https://get.helm.sh/helm-v3.12.1-linux-amd64.tar.gz"
+          tar -xf helm.tar.gz
+          export PATH="$PWD/linux-amd64:$PATH"
+          sed -i 's#4.1.0-RELEASE-MARKER#${{ env.BASE_IMAGE_NAME }}:$VERSION#g' $GITHUB_WORKSPACE/kubernetes/charts/weblogic-operator/values.yaml
+          mkdir $GITHUB_WORKSPACE/WORK
+          helm package --app-version $VERSION --version $VERSION $GITHUB_WORKSPACE/kubernetes/charts/weblogic-operator -d $GITHUB_WORKSPACE/WORK
+          cp $GITHUB_WORKSPACE/WORK/*.tgz $GITHUB_WORKSPACE/gh-pages/charts/
+          helm repo index $GITHUB_WORKSPACE/gh-pages/charts/ --url https://oracle.github.io/weblogic-kubernetes-operator/charts
+          cd $GITHUB_WORKSPACE/gh-pages
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add --all
+          git commit -m "Helm chart update from release GitHub Action"
+          git push origin gh-pages

Dockerfile

@@ -1,11 +1,6 @@
 # Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
-# HOW TO BUILD AND PUSH THIS IMAGE
-# -----------------------
-# Run:
-#      $ ./buildAndPushImage.sh -t <image-name>
-#
 # -------------------------
 FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
 

README.md

@@ -24,11 +24,6 @@ You can:
 
 The fastest way to experience the operator is to follow the [Quick Start guide](https://oracle.github.io/weblogic-kubernetes-operator/quickstart/), or you can peruse our [documentation](https://oracle.github.io/weblogic-kubernetes-operator), read our [blogs](https://blogs.oracle.com/weblogicserver/how-to-weblogic-server-on-kubernetes), or try out the [samples](https://oracle.github.io/weblogic-kubernetes-operator/samples/).
 
-***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 4.0.6.
-This release was published on April 8, 2023.
-***
-
 ## Documentation
 
 Documentation for the operator is [available here](https://oracle.github.io/weblogic-kubernetes-operator).

buildAndPushImage.sh

@@ -312,12 +312,8 @@
         },
         "domainType": {
           "default": "JRF",
-          "description": "WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF.",
-          "type": "string",
-          "enum": [
-            "WLS",
-            "JRF"
-          ]
+          "description": "WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF.",
+          "type": "string"
         },
         "opss": {
           "description": "Settings for OPSS security.",
@@ -872,10 +868,6 @@
         "resources": {
           "description": "Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
-        },
-        "volumeMode": {
-          "description": "VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec.",
-          "type": "string"
         }
       }
     },
@@ -901,10 +893,6 @@
         "capacity": {
           "description": "Capacity is the description of the persistent volume\u0027s resources and capacity. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
           "$ref": "#/definitions/Map"
-        },
-        "volumeMode": {
-          "description": "VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec.",
-          "type": "string"
         }
       }
     },

documentation/domains/Domain.json

@@ -305,7 +305,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | `createIfNotExists` | string | Specifies if the operator should create only the domain or the domain with RCU (for JRF-based domains). Legal values: domain, domainAndRCU. Defaults to domain. |
 | `domainCreationConfigMap` | string | Name of a ConfigMap containing the WebLogic Deploy Tooling model. |
 | `domainCreationImages` | Array of [Domain Creation Image](#domain-creation-image) | Domain creation images containing WebLogic Deploy Tooling model, application archive, and WebLogic Deploy Tooling installation files. These files will be used to create the domain during introspection. This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share the files from the additional images  |
-| `domainType` | string | WebLogic Deploy Tooling domain type. Legal values: WLS, JRF. Defaults to JRF. |
+| `domainType` | string | WebLogic Deploy Tooling domain type. Known values are: WLS, RestrictedJRF, JRF. Defaults to JRF. |
 | `opss` | [Opss](#opss) | Settings for OPSS security. |
 
 ### Persistent Volume
@@ -365,15 +365,13 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | `nfs` | [NFS Volume Source](k8s1.13.5.md#nfs-volume-source) | nfs represents an NFS mount on the host. Provisioned by an admin. More info:<br/>https://kubernetes.io/docs/concepts/storage/volumes#nfs<br/>Represents an NFS mount that lasts the lifetime of a pod. NFS volumes do not support ownership management or SELinux relabeling. |
 | `persistentVolumeReclaimPolicy` | string | PersistentVolumeReclaimPolicy defines what happens to a persistent volume when released from its claim. Valid options are Retain (default for manually created PersistentVolumes), Delete (default for dynamically provisioned PersistentVolumes), and Recycle (deprecated). Recycle must be supported by the volume plugin underlying this PersistentVolume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#reclaiming   |
 | `storageClassName` | string | StorageClassName is the name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass. |
-| `volumeMode` | string | VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec. |
 
 ### Persistent Volume Claim Spec
 
 | Name | Type | Description |
 | --- | --- | --- |
 | `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements. |
 | `storageClassName` | string | StorageClassName is the name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass. |
-| `volumeMode` | string | VolumeMode defines if a volume is intended to be used with a formatted filesystem or to remain in raw block state. Value of Filesystem is implied when not included in spec. |
 | `volumeName` | string | VolumeName is the binding reference to the PersistentVolume backing this claim. |
 
 ### WDT Timeouts

documentation/domains/Domain.md

@@ -32,7 +32,7 @@ using the operator to deploy and run a WebLogic domain container-packaged web ap
 #### Current production release
 
 The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is {{< latestVersion >}}.
-This release was published on April 8, 2023. See the [operator prerequisites]({{< relref "/introduction/prerequisites/introduction.md" >}}) and [supported environments]({{< relref "/introduction/platforms/environments.md" >}}).
+See the [operator prerequisites]({{< relref "/introduction/prerequisites/introduction.md" >}}) and [supported environments]({{< relref "/introduction/platforms/environments.md" >}}).
 
 ***
 

documentation/site/content/_index.md

@@ -80,7 +80,7 @@ Finally, you can use the WIT `inspect` command to [inspect images]({{< relref "/
     - Optionally, includes a WDT installation and model files in the image
       (for Model in Image domains).
     - _Important_:
-      - **Note:** Patching an Oracle Home using the WIT `update`
+      - **NOTE**: Patching an Oracle Home using the WIT `update`
         command results in a larger WebLogic Server image
         due to the immutable layering in container images. For small updates, such as a one-off patch,
         the increase in the image size may be negligible. However, for larger updates, the increase in size will be _significant_.
@@ -144,7 +144,7 @@ sample assumes that you have installed WIT in `/tmp/imagetool`; you can choose t
 
 1. Download your desired WebLogic Server installer from the Oracle Technology Network [WebLogic Server installers](https://www.oracle.com/middleware/technologies/weblogic-server-installers-downloads.html) page or from the [Oracle Software Delivery Cloud](https://edelivery.oracle.com/osdc/faces/Home.jspx) (OSDC).
 
-   **Note:** The WebLogic Server installers will not be fully patched.
+   **NOTE**: The WebLogic Server installers will not be fully patched.
    In a subsequent step, you'll use
    the WIT `--patches` or `--recommendedPatches` options
    to apply one-off and recommended Oracle patches.
@@ -214,7 +214,7 @@ Oracle has extended support of WebLogic Server 12.2.1.3, for six months _only_,
      --passwordEnv=MYPWD
    ```
 
-   **Notes:**
+   **NOTES**:
    - To enable WIT to download patches,
         you must supply your My Oracle Support (Oracle Single Sign-On) credentials
      using the `--user` and `--passwordEnv` parameters (or one of the other password CLA options).
@@ -494,7 +494,7 @@ to create the domain home in Domain in Image.
 
   {{% /expand %}}
 
-**Notes**:
+**NOTES**:
 
 - The sample script and its `domain.properties` file include a sample WebLogic administration password.
   These files must be protected and the sample password must be changed.
@@ -507,7 +507,7 @@ to create the domain home in Domain in Image.
 
 #### Create a custom image with your model inside the image
 
-**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) will be deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
+**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) is deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
 
 {{% notice warning %}}
 The example in this section references a base image,
@@ -581,16 +581,17 @@ Example steps for creating a custom WebLogic image with a Model in Image file la
      --chown oracle:root
    ```
 
-   __Note__: If using a Fusion Middleware Infrastructure base image,
+   **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`.
+   **Also note** that JRF support in Model in Image domains is deprecated in operator version 4.1.0; For JRF domains, use the [Domain on PV]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) domain home source type instead.
 
 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__:
+   **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.