Skip to content

Commit ef2304f

Browse files
rjeberhardrjeberhard
committed
merge 3.3 and 3.4 work
1 parent 5da9ab2 commit ef2304f

File tree

7 files changed

+76
-81
lines changed

7 files changed

+76
-81
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ With the latest Java versions, Java 8 update 191 and later, or Java 11, if you d
100100

101101
##### Configuring heap size
102102

103-
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:
103+
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:
104104

105105
```yaml
106106
spec:
107107
resources:
108108
env:
109109
- name: USER_MEM_ARGS
110-
value: "-XX:MinRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0 -Djava.security.egd=file:/dev/./urandom"
110+
value: "-XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0 -Djava.security.egd=file:/dev/./urandom"
111111
```
112112

113113
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
116116
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.
117117
{{% /notice %}}
118118

119-
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`).
119+
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`).
120120

121121
#### CPU resource considerations
122122

‎documentation/3.4/content/release-notes.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ draft: false
88

99
| Date | Version | Introduces backward incompatibilities? | Change - See also, [Change log](#change-log). |
1010
|--------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
11-
| TBD, 2022 | v3.4.0 | no | TBD. |
1211
| February 18, 2022 | v3.3.8 | no | Resolved several issues related to WDT 2.0, Istio, and auxiliary images. |
1312
| December 21, 2021 | v3.3.7 | no | Resolved two issues related to auxiliary images. |
1413
| November 24, 2021 | v3.3.6 | no | Support added for a `hostAliases` field for WebLogic Server pod generation. |
@@ -52,10 +51,6 @@ draft: false
5251

5352
### Change log
5453

55-
#### Operator 3.4.0
56-
57-
TBD
58-
5954
#### Operator 3.3.8
6055

6156
* 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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ You need to set up the domain configuration for the WebLogic domain.
305305
serverPodMemoryLimit: "1.5Gi"
306306
serverPodCpuLimit: "250m"
307307

308-
javaOptions: -Dweblogic.StdoutDebugEnabled=false -XX:MinRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0
308+
javaOptions: -Dweblogic.StdoutDebugEnabled=false -XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0
309309
```
310310
311311
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,14 @@ Name: domain1
316316
Namespace: default
317317
Labels: weblogic.domainUID=domain1
318318
Annotations: <none>
319-
API Version: weblogic.oracle/v2
319+
API Version: weblogic.oracle/v8
320320
Kind: Domain
321321
Metadata:
322322
Cluster Name:
323323
Creation Timestamp: 2019-01-10T14:29:37Z
324324
Generation: 1
325325
Resource Version: 3698533
326-
Self Link: /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
326+
Self Link: /apis/weblogic.oracle/v8/namespaces/default/domains/domain1
327327
UID: 28655979-14e4-11e9-b751-fa163e855ac8
328328
Spec:
329329
Admin Server:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ $ kubectl describe domain domain1
244244
Name: domain1
245245
Namespace: default
246246
Labels: weblogic.domainUID=domain1
247-
Annotations: kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"weblogic.oracle/v2","kind":"Domain","metadata":{"annotations":{},"labels":{"weblogic.domainUID":"domain1",...
248-
API Version: weblogic.oracle/v2
247+
Annotations: kubectl.kubernetes.io/last-applied-configuration={"apiVersion":"weblogic.oracle/v8","kind":"Domain","metadata":{"annotations":{},"labels":{"weblogic.domainUID":"domain1",...
248+
API Version: weblogic.oracle/v8
249249
Kind: Domain
250250
Metadata:
251251
Cluster Name:
252252
Creation Timestamp: 2019-01-10T14:50:52Z
253253
Generation: 1
254254
Resource Version: 3700284
255-
Self Link: /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
255+
Self Link: /apis/weblogic.oracle/v8/namespaces/default/domains/domain1
256256
UID: 2023ae0a-14e7-11e9-b751-fa163e855ac8
257257
Spec:
258258
Admin Server:

0 commit comments

Comments
 (0)