merge 3.3 and 3.4 work

Author: rjeberhard

documentation/3.4/content/faq/resource-settings.md

@@ -100,14 +100,14 @@ With the latest Java versions, Java 8 update 191 and later, or Java 11, if you d
 
 ##### Configuring heap size
 
-If you specify Pod memory limits, Oracle recommends configuring WebLogic Server heap sizes as a percentage. The JVM will interpret the percentage as a fraction of the limit. This is done using the JVM `-XX:MinRAMPercentage` and `-XX:MaxRAMPercentage` options in the `USER_MEM_ARGS` [Domain environment variable]({{< relref "/userguide/managing-domains/domain-resource#jvm-memory-and-java-option-environment-variables" >}}).  For example:
+If you specify Pod memory limits, Oracle recommends configuring WebLogic Server heap sizes as a percentage. The JVM will interpret the percentage as a fraction of the limit. This is done using the JVM `-XX:InitialRAMPercentage` and `-XX:MaxRAMPercentage` options in the `USER_MEM_ARGS` [Domain environment variable]({{< relref "/userguide/managing-domains/domain-resource#jvm-memory-and-java-option-environment-variables" >}}).  For example:
 
 ```yaml
   spec:
     resources:
       env:
       - name: USER_MEM_ARGS
-        value: "-XX:MinRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0 -Djava.security.egd=file:/dev/./urandom"
+        value: "-XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0 -Djava.security.egd=file:/dev/./urandom"
 ```
 
 Additionally, there's a `node-manager` process that's running in the same container as the WebLogic Server, which has its own heap and native memory requirements. Its heap is tuned by using `-Xms` and `-Xmx` in the `NODEMGR_MEM_ARGS` environment variable. Oracle recommends setting the Node Manager heap memory to fixed sizes, instead of percentages, where [the default tuning]({{< relref "/userguide/managing-domains/domain-resource#jvm-memory-and-java-option-environment-variables" >}}) is usually sufficient.
@@ -116,7 +116,7 @@ Additionally, there's a `node-manager` process that's running in the same contai
 Notice that the `NODEMGR_MEM_ARGS`, `USER_MEM_ARGS`, and `WLST_EXTRA_PROPERTIES` environment variables all include `-Djava.security.egd=file:/dev/./urandom` by default. This helps to speed up the Node Manager and WebLogic Server startup on systems with low entropy, plus similarly helps to speed up introspection job usage of the WLST `encrypt` command. We have included this property in the above example for specifying a custom `USER_MEM_ARGS` value in order to preserve this speedup. See the [environment variable defaults]({{< relref "/userguide/managing-domains/domain-resource#jvm-memory-and-java-option-environment-variables" >}}) documentation for more information.
 {{% /notice %}}
 
-In some cases, you might only want to configure memory resource requests but not configure memory resource limits. In such scenarios, you can use the traditional fixed heap size settings (`-Xms` and `-Xmx`) in your WebLogic Server `USER_MEM_ARGS` instead of the percentage settings (`-XX:MinRAMPercentage` and `-XX:MaxRAMPercentage`).
+In some cases, you might only want to configure memory resource requests but not configure memory resource limits. In such scenarios, you can use the traditional fixed heap size settings (`-Xms` and `-Xmx`) in your WebLogic Server `USER_MEM_ARGS` instead of the percentage settings (`-XX:InitialRAMPercentage` and `-XX:MaxRAMPercentage`).
 
 #### CPU resource considerations
 

documentation/3.4/content/release-notes.md

@@ -8,7 +8,6 @@ draft: false
 
 | Date               | Version  | Introduces backward incompatibilities?                                                                                                      | Change - See also, [Change log](#change-log).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 |--------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| TBD, 2022          | v3.4.0   | no                                                                                                                                          | TBD.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | February 18, 2022  | v3.3.8   | no                                                                                                                                          | Resolved several issues related to WDT 2.0, Istio, and auxiliary images.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | December 21, 2021  | v3.3.7   | no                                                                                                                                          | Resolved two issues related to auxiliary images.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | November 24, 2021  | v3.3.6   | no                                                                                                                                          | Support added for a `hostAliases` field for WebLogic Server pod generation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
@@ -52,10 +51,6 @@ draft: false
 
 ### Change log
 
-#### Operator 3.4.0
-
-TBD
-
 #### Operator 3.3.8
 
 * Resolved an issue where the WebLogic Server Administration Console is not accessible through port forwarding after upgrade to WebLogic Deploy Tooling (WDT) 2.0 ([#2776](https://github.com/oracle/weblogic-kubernetes-operator/pull/2776)).

documentation/3.4/content/samples/azure-kubernetes-service/domain-on-pv.md

@@ -305,7 +305,7 @@ You need to set up the domain configuration for the WebLogic domain.
     serverPodMemoryLimit: "1.5Gi"
     serverPodCpuLimit: "250m"
 
-    javaOptions: -Dweblogic.StdoutDebugEnabled=false -XX:MinRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0
+    javaOptions: -Dweblogic.StdoutDebugEnabled=false -XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0
     ```
 
     Notice that the `Limit` and `Request` values are the same for each of `serverPodMemory` and `serverPodCpu`.  This is intentional.  To learn why, see [Create a Pod that gets assigned a QoS class of Guaranteed](https://kubernetes.io/docs/tasks/configure-pod-container/quality-service-pod/#create-a-pod-that-gets-assigned-a-qos-class-of-guaranteed).  You must have allocated sufficient CPU and memory resources so that the pod can be scheduled for running by Kubernetes.  This is an example of **capacity planning**, a very important Kubernetes success factor. For more details on capacity planning with AKS, see [Azure Kubernetes Service Cluster Capacity Planning

documentation/3.4/content/samples/domains/domain-home-in-image/_index.md

@@ -316,14 +316,14 @@ Name:         domain1
 Namespace:    default
 Labels:       weblogic.domainUID=domain1
 Annotations:  <none>
-API Version:  weblogic.oracle/v2
+API Version:  weblogic.oracle/v8
 Kind:         Domain
 Metadata:
   Cluster Name:        
   Creation Timestamp:  2019-01-10T14:29:37Z
   Generation:          1
   Resource Version:    3698533
-  Self Link:           /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
+  Self Link:           /apis/weblogic.oracle/v8/namespaces/default/domains/domain1
   UID:                 28655979-14e4-11e9-b751-fa163e855ac8
 Spec:
   Admin Server:

documentation/3.4/content/samples/domains/domain-home-on-pv/_index.md

@@ -244,15 +244,15 @@ $ kubectl describe domain domain1
 Name:         domain1
 Namespace:    default
 Labels:       weblogic.domainUID=domain1
-Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"weblogic.oracle/v2","kind":"Domain","metadata":{"annotations":{},"labels":{"weblogic.domainUID":"domain1",...
-API Version:  weblogic.oracle/v2
+Annotations:  kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"weblogic.oracle/v8","kind":"Domain","metadata":{"annotations":{},"labels":{"weblogic.domainUID":"domain1",...
+API Version:  weblogic.oracle/v8
 Kind:         Domain
 Metadata:
   Cluster Name:        
   Creation Timestamp:  2019-01-10T14:50:52Z
   Generation:          1
   Resource Version:    3700284
-  Self Link:           /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
+  Self Link:           /apis/weblogic.oracle/v8/namespaces/default/domains/domain1
   UID:                 2023ae0a-14e7-11e9-b751-fa163e855ac8
 Spec:
   Admin Server: