Skip to content

Commit 9b075da

Browse files
authored
Merge pull request #1014 from oracle/start-script-enabled
Node manager and Java options from jrf_support branch
2 parents 1fd97b6 + e7c3998 commit 9b075da

File tree

17 files changed

+31
-20
lines changed

17 files changed

+31
-20
lines changed

docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ spec:
213213
- name: JAVA_OPTIONS
214214
value: "-Dweblogic.StdoutDebugEnabled=false"
215215
- name: USER_MEM_ARGS
216-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
216+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
217217
# volumes:
218218
# - name: weblogic-domain-storage-volume
219219
# persistentVolumeClaim:

docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ spec:
170170
- name: JAVA_OPTIONS
171171
value: "-Dweblogic.StdoutDebugEnabled=false"
172172
- name: USER_MEM_ARGS
173-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
173+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
174174
volumes:
175175
- name: weblogic-domain-storage-volume
176176
persistentVolumeClaim:

docs-source/content/userguide/managing-domains/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Please be aware of the following important considerations for WebLogic domains r
6363
* _Host Path Persistent Volumes:_ If using a `hostPath` persistent volume, then it must be available on all worker nodes in the cluster and have read/write/many permissions for all container/pods in the WebLogic Server deployment. Be aware
6464
that many cloud provider's volume providers may not support volumes across availability zones. You may want to use NFS or a clustered file system to work around this limitation.
6565

66-
* _Security Note:_ The `USER_MEM_ARGS` environment variable defaults to `-Djava.security.egd=file:/dev/./urandom` in all WebLogic Server pods and the WebLogic introspection job. It can be explicitly set to another value in your domain resource YAML file using the `env` attribute under the `serverPod` configuration.
66+
* _Security Note:_ The `USER_MEM_ARGS` environment variable defaults to `-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom` in all WebLogic Server pods and the WebLogic introspection job. It can be explicitly set to another value in your domain resource YAML file using the `env` attribute under the `serverPod` configuration.
6767

6868
The following features are **not** certified or supported in this release:
6969

kubernetes/samples/scripts/common/domain-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
- name: JAVA_OPTIONS
4747
value: "%JAVA_OPTIONS%"
4848
- name: USER_MEM_ARGS
49-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
49+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
5050
%LOG_HOME_ON_PV_PREFIX%volumes:
5151
%LOG_HOME_ON_PV_PREFIX%- name: weblogic-domain-storage-volume
5252
%LOG_HOME_ON_PV_PREFIX% persistentVolumeClaim:

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ spec:
195195
- name: JAVA_OPTIONS
196196
value: "-Dweblogic.StdoutDebugEnabled=false"
197197
- name: USER_MEM_ARGS
198-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
198+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
199199
# volumes:
200200
# - name: weblogic-domain-storage-volume
201201
# persistentVolumeClaim:

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ spec:
163163
- name: JAVA_OPTIONS
164164
value: "-Dweblogic.StdoutDebugEnabled=false"
165165
- name: USER_MEM_ARGS
166-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
166+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
167167
volumes:
168168
- name: weblogic-domain-storage-volume
169169
persistentVolumeClaim:

model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public void whenDomainReadFromYaml_Server1OverridesDefaults() throws IOException
399399
hasItem(
400400
envVar(
401401
"USER_MEM_ARGS",
402-
"-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "))));
402+
"-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "))));
403403
assertThat(serverSpec.getDesiredState(), equalTo("RUNNING"));
404404
}
405405

model/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainV2Test.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,9 @@ public void whenDomainReadFromYaml_server1OverridesDefaults() throws IOException
707707
serverSpec.getEnvironmentVariables(),
708708
containsInAnyOrder(
709709
envVar("JAVA_OPTIONS", "-server"),
710-
envVar("USER_MEM_ARGS", "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "),
710+
envVar(
711+
"USER_MEM_ARGS",
712+
"-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "),
711713
envVar("var1", "value0")));
712714
assertThat(serverSpec.getConfigOverrides(), equalTo("overrides-config-map"));
713715
assertThat(

model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample-4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ spec:
102102
- name: JAVA_OPTIONS
103103
value: "-server"
104104
- name: USER_MEM_ARGS
105-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
105+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
106106
nodeSelector:
107107
os_arch: arm64
108108
resources:

model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
- name: JAVA_OPTIONS
8787
value: "-server"
8888
- name: USER_MEM_ARGS
89-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
89+
value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
9090
nodeSelector:
9191
os_arch: arm64
9292
resources:

0 commit comments

Comments
 (0)