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

Author: rjeberhard

Jenkinsfile

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+// 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.
 //
 import groovy.json.JsonSlurper
@@ -131,8 +131,6 @@ pipeline {
     environment {
         github_url = "${env.GIT_URL}"
         github_creds = 'ecnj_github'
-        dockerhub_username_creds = 'docker-username'
-        dockerhub_password_creds = 'docker-password'
         ocr_username_creds = 'OCR username'
         ocr_password_creds = 'OCR Password'
         ocir_registry_creds = 'ocir-server'
@@ -384,12 +382,7 @@ pipeline {
                 }
 
                 stage('Build WebLogic Kubernetes Operator') {
-                    environment {
-                        DOCKERHUB_USERNAME = credentials("${dockerhub_username_creds}")
-                        DOCKERHUB_PASSWORD = credentials("${dockerhub_password_creds}")
-                    }
                     steps {
-                        sh 'echo ${DOCKERHUB_PASSWORD} | docker login -u ${DOCKERHUB_USERNAME} --password-stdin'
                         sh "mvn -DtrimStackTrace=false clean install"
                     }
                 }

Jenkinsfile.kindnightly

@@ -108,8 +108,6 @@ pipeline {
     environment {
         github_url = "${env.GIT_URL}"
         github_creds = 'ecnj_github'
-        dockerhub_username_creds = 'docker-username'
-        dockerhub_password_creds = 'docker-password'
         ocr_username_creds = 'OCR username'
         ocr_password_creds = 'OCR Password'
         ocir_registry_creds = 'ocir-server'
@@ -349,12 +347,7 @@ pipeline {
                 }
 
                 stage('Build WebLogic Kubernetes Operator') {
-                    environment {
-                        DOCKERHUB_USERNAME = credentials("${dockerhub_username_creds}")
-                        DOCKERHUB_PASSWORD = credentials("${dockerhub_password_creds}")
-                    }
                     steps {
-                        sh 'echo ${DOCKERHUB_PASSWORD} | docker login -u ${DOCKERHUB_USERNAME} --password-stdin'
                         sh "mvn -DtrimStackTrace=false clean install"
                     }
                 }

Jenkinsfile.oke

@@ -5,7 +5,7 @@
 pipeline {
     agent { label 'VM.Standard2.8' }
     options {
-        timeout(time: 1200, unit: 'MINUTES')
+        timeout(time: 1800, unit: 'MINUTES')
         disableConcurrentBuilds()
     }
 
@@ -46,7 +46,7 @@ pipeline {
         start_time = sh(script: 'date +"%Y-%m-%d %H:%M:%S"', returnStdout: true).trim()
         wle_download_url="https://github.com/oracle/weblogic-logging-exporter/releases/latest"
 
-        CLUSTER_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'mtcluster' : 'mkcluster'}"
+        CLUSTER_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'parcluster' : 'seqcluster'}"
         kubeconfig_file = "${WORKSPACE}/terraform/${CLUSTER_NAME}_kubeconfig"
         MAVEN_PROFILE_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'oke-parallel' : 'oke-sequential'}"
         availability_domain = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'VPGL:PHX-AD-1' : 'VPGL:PHX-AD-2'}"
@@ -62,25 +62,25 @@ pipeline {
 
         string(name: 'KUBE_VERSION',
                description: 'kube version for oke cluster',
-               defaultValue: '1.24.1'
+               defaultValue: '1.25.4'
         )
         string(name: 'IMAGE_ID',
                        description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',
-                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaa6med26u7lkdeyz6mjwaepakor5bp2y24lwr4x6adn6izidipbbsa'
-                       //8.0defaultValue: 'ocid1.image.oc1.phx.aaaaaaaan7lpv4nxnx4r772csco2nzre3owzqdebf75ty6mlbp562vn6c45q'
+                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaancucg25pze6m52agxwxmmfszvsdnhp3kvim53pts2tw6mik4xtha'
+                       //8.0defaultValue: 'ocid1.image.oc1.phx.aaaaaaaancq36l7q4fqwznqhnp626wuekkq7twk2em5ysyd65bd4xho72tmq'
 
                 )
         string(name: 'KUBECTL_VERSION',
                        description: 'kubectl version',
-                       defaultValue: '1.24.8'
+                       defaultValue: '1.25.4'
                 )
         string(name: 'HELM_VERSION',
                description: 'Helm version',
                defaultValue: '3.10.2'
         )
         string(name: 'ISTIO_VERSION',
                description: 'Other Possible Values 1.7.3, 1.8.1, 1.7.6',
-               defaultValue: '1.10.4'
+               defaultValue: '1.16.1'
         )
 
         string(name: 'NUMBER_OF_THREADS',
@@ -141,11 +141,11 @@ pipeline {
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
-               defaultValue: '15.2.0'
+               defaultValue: '17.0.0'
         )
         string(name: 'GRAFANA_CHART_VERSION',
                description: '',
-               defaultValue: '6.38.6'
+               defaultValue: '6.44.11'
         )
         booleanParam(name: 'COLLECT_LOGS_ON_SUCCESS',
                      description: 'Collect logs for successful runs. Default is false.',
@@ -228,7 +228,7 @@ pipeline {
 
                         export OKE_CLUSTER="true"
                         if [ ${MAVEN_PROFILE_NAME} = 'oke-parallel' ]; then
-                           VCN_CIDR_PREFIX="10.1"
+                           VCN_CIDR_PREFIX="10.4"
                         else
                            VCN_CIDR_PREFIX="10.3"
                         fi

documentation/3.4/content/userguide/introduction/get-help.md

@@ -19,7 +19,7 @@ details of how to access our Slack workspace.
 After you are logged in, please come to `#operator` and say, "hello!"
 
 ### GitHub issues
-To quickly get help, we strongly recommend using [Oracle Slack](#oracle-slack).
+To quickly get help, we strongly recommend using [Oracle Slack](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ).
 If this is insufficient, then feel free
 to submit a [GitHub Issue](https://github.com/oracle/weblogic-kubernetes-operator/issues) on the
 WebLogic Kubernetes Operator project. All issues are public.

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

@@ -160,12 +160,6 @@ sample assumes that you have installed WIT in `/tmp/imagetool`; you can choose t
      --path=/home/acmeuser/wls-installers/jre-8u291-linux-x64.tar.gz
    ```
    ```shell
-   $ /tmp/imagetool/bin/imagetool.sh cache addInstaller \
-     --type=wls \
-     --version=12.2.1.3.0 \
-     --path=/home/acmeuser/wls-installers/fmw_12.2.1.3.0_wls_Disk1_1of1.zip
-   ```
-   ```shell
    $ /tmp/imagetool/bin/imagetool.sh cache addInstaller \
      --type=wls \
      --version=12.2.1.4.0 \
@@ -203,6 +197,11 @@ sample assumes that you have installed WIT in `/tmp/imagetool`; you can choose t
    - The minimal patches required for the operator to run a 12.2.1.3 image
      (patches 29135930 and 27117282)
      instead of the latest recommended patches
+
+{{% notice note %}} As of December, 2022, Fusion Middleware 12.2.1.3 is no longer supported.  The last Critical Patch Updates (CPU) images for FMW Infrastructure 12.2.1.3 were published in October, 2022.
+Oracle has extended support of WebLogic Server 12.2.1.3, for six months _only_, for PSUs and security patches. CPU images for WebLogic Server 12.2.1.3 will be published in the January, 2023, and April, 2023, CPU cycles.
+{{% /notice %}}
+
    ```shell
    $ /tmp/imagetool/bin/imagetool.sh create \
      --tag minimal_weblogic:12.2.1.3 \
@@ -593,7 +592,7 @@ Example steps for creating a custom WebLogic image with a Model in Image file la
    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.

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

@@ -29,6 +29,11 @@ The Oracle Container Registry (OCR) is located at [https://container-registry.or
 
 OCR contains WebLogic Server images, which have a pre-installed Oracle Home with Oracle WebLogic Server and Coherence. OCR, also, contains Fusion Middleware Infrastructure images, which have a pre-installed Oracle Home with Oracle WebLogic Server, Coherence, Fusion Middleware Control, and Java Required Files (JRF). **Note**: Oracle strongly recommends that you use _only_ images with the latest set of recommended patches applied.
 
+{{% notice note %}}
+As of December, 2022, Fusion Middleware 12.2.1.3 is no longer supported.  The last Critical Patch Updates (CPU) images for FMW Infrastructure 12.2.1.3 were published in October, 2022.
+Oracle has extended support of WebLogic Server 12.2.1.3, for six months _only_, for PSUs and security patches. CPU images for WebLogic Server 12.2.1.3 will be published in the January, 2023, and April, 2023, CPU cycles.
+{{% /notice %}}
+
 See the following sections for information about OCR images:
 - [Compare General Availability to Critical Patch Updates images](#compare-general-availability-to-critical-patch-updates-images)
 - [WebLogic distribution installer type](#weblogic-distribution-installer-type)

documentation/4.0/content/introduction/get-help.md

@@ -19,7 +19,7 @@ details of how to access our Slack workspace.
 After you are logged in, please come to `#operator` and say, "hello!"
 
 ### GitHub issues
-To quickly get help, we strongly recommend using [Oracle Slack](#oracle-slack).
+To quickly get help, we strongly recommend using [Oracle Slack](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ).
 If this is insufficient, then feel free
 to submit a [GitHub Issue](https://github.com/oracle/weblogic-kubernetes-operator/issues) on the
 WebLogic Kubernetes Operator project. All issues are public.

documentation/4.0/content/introduction/prerequisites/introduction.md

@@ -16,6 +16,11 @@ For the current production release {{< latestVersion >}}:
 * Either Oracle WebLogic Server 12.2.1.3.0 with patch 29135930, Oracle WebLogic Server 12.2.1.4.0, or Oracle WebLogic Server 14.1.1.0.0.
    * The existing WebLogic Server General Availability image, `container-registry.oracle.com/middleware/weblogic:12.2.1.3`,
    has this patch applied.
+   * **NOTE**:
+
+      * As of December, 2022, Fusion Middleware 12.2.1.3 is no longer supported.  The last Critical Patch Updates (CPU) images for FMW Infrastructure 12.2.1.3 were published in October, 2022.
+      * Oracle has extended support of WebLogic Server 12.2.1.3, for six months _only_, for PSUs and security patches. CPU images for WebLogic Server 12.2.1.3 will be published in the January, 2023, and April, 2023, CPU cycles.
+
    {{% notice warning %}}
    Throughout the documentation, the sample images are General Availability (GA) images. GA images are suitable for demonstration and development purposes _only_ where the environments are not available from the public Internet; they are **not acceptable for production use**. In production, you should always use CPU (patched) images from [OCR]({{< relref "/base-images/ocr-images.md" >}}) or create your images using the [WebLogic Image Tool]({{< relref "/base-images/custom-images#create-a-custom-base-image" >}}) (WIT) with the `--recommendedPatches` option. For more guidance, see [Apply the Latest Patches and Updates](https://www.oracle.com/pls/topic/lookup?ctx=en/middleware/standalone/weblogic-server/14.1.1.0&id=LOCKD-GUID-2DA84185-46BA-4D7A-80D2-9D577A4E8DE2) in _Securing a Production Environment for Oracle WebLogic Server_. For details on how to obtain or create images, see [WebLogic images]({{< relref "/base-images/_index.md" >}}).
    {{% /notice %}}

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

@@ -54,6 +54,8 @@ The standard pre-built FMW Infrastructure General Availability image, `container
 has this patch applied. The FMW Infrastructure 12.2.1.4.0 images do not require this patch. For detailed instructions
 on how to log in to the Oracle Container Registry and accept license agreement, see this [document]({{< relref "/base-images/ocr-images#obtain-images-from-the-oracle-container-registry" >}}).
 
+**NOTE**: As of December, 2022, Fusion Middleware 12.2.1.3 is no longer supported.  The last Critical Patch Updates (CPU) images for FMW Infrastructure 12.2.1.3 were published in October, 2022.
+
 {{% notice warning %}}
 This sample uses General Availability (GA) images. GA images are suitable for demonstration and development purposes _only_ where the environments are not available from the public Internet; they are **not acceptable for production use**. In production, you should always use CPU (patched) images from [OCR]({{< relref "/base-images/ocr-images.md" >}}) or create your images using the [WebLogic Image Tool]({{< relref "/base-images/custom-images#create-a-custom-base-image" >}}) (WIT) with the `--recommendedPatches` option. For more guidance, see [Apply the Latest Patches and Updates](https://www.oracle.com/pls/topic/lookup?ctx=en/middleware/standalone/weblogic-server/14.1.1.0&id=LOCKD-GUID-2DA84185-46BA-4D7A-80D2-9D577A4E8DE2) in _Securing a Production Environment for Oracle WebLogic Server_.
 {{% /notice %}}

documentation/4.0/content/managing-domains/model-in-image/usage.md

@@ -33,6 +33,8 @@ Model in Image requires an image with a WebLogic Server installation.
 
 - Or, you can manually build your own base image, as described in [Create a custom image with patches applied]({{< relref "/base-images/custom-images#create-a-custom-image-with-patches-applied" >}}). This is useful if you want your base images to include additional patches. Note that any 12.2.1.3 image must also include patch 29135930 (the pre-built images already contain this patch).
 
+  **NOTE**: As of December, 2022, Oracle will continue support of WebLogic Server 12.2.1.3, for six months _only_, for PSUs and security patches. CPU images for WebLogic Server 12.2.1.3 will be published in the January, 2023, and April, 2023, CPU cycles.
+
 ### Directory structure
 
 Model in Image requires the following directory structure in its pods for