Merge branch 'cherry-pick-130038a7' into 'release/4.0'

Cherry-pick 'russ_owls-108473' into 'release/4.0'

See merge request weblogic-cloud/weblogic-kubernetes-operator!4282

Author: rjeberhard

deployment/scripts/operator.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 echo "Launching Oracle WebLogic Server Kubernetes Operator..."
@@ -63,11 +63,8 @@ mkdir -m 777 -p /logs
 # assumption is that we have mounted a volume on /logs which is also visible to
 # the logstash container/pod.
 
-# Container memory optimization flags
-HEAP="-XshowSettings:vm"
-
 # Start operator
-java $HEAP $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
+java $JVM_OPTIONS $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
 PID=$!
 wait $PID
 

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -89,6 +89,8 @@ spec:
           value: {{ int64 .javaLoggingFileSizeLimit | default 20000000 | quote }}
         - name: "JAVA_LOGGING_COUNT"
           value: {{ .javaLoggingFileCount | default 10 | quote }}
+        - name: "JVM_OPTIONS"
+          value: {{ .jvmOptions | default "-XshowSettings:vm -XX:MaxRAMPercentage=70" | quote }}
         {{- if .remoteDebugNodePortEnabled }}
         - name: "REMOTE_DEBUG_PORT"
           value: {{ .internalDebugHttpPort | quote }}

kubernetes/charts/weblogic-operator/values.yaml

@@ -269,3 +269,8 @@ clusterSizePaddingValidationEnabled: true
 # runAsuser specifies the UID to run the operator and conversion webhook container processes. 
 # If not specified, it defaults to the user specified in the operator's container image.
 #runAsUser: 1000
+
+# jvmOptions specifies a value used to control the Java process that runs the operator, such as the maximum heap size
+# that will be allocated.
+#jvmOptions: -XshowSettings:vm -XX:MaxRAMPercentage=70
+

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

@@ -267,6 +267,10 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
                                             newEnvVar()
                                                 .name("JAVA_LOGGING_COUNT")
                                                 .value("10"))
+                                        .addEnvItem(
+                                            newEnvVar()
+                                                .name("JVM_OPTIONS")
+                                                .value("-XX:MaxRAMPercentage=70"))
                                         .resources(
                                             new V1ResourceRequirements()
                                                 .putRequestsItem("cpu", Quantity.fromString("250m"))

kubernetes/src/test/java/oracle/kubernetes/operator/helm/HelmOperatorValues.java

@@ -34,6 +34,7 @@ class HelmOperatorValues extends OperatorValues {
     loadFromMap(map, this::setExternalOperatorKey, "externalOperatorKey");
     loadFromMap(map, this::setLogStashImage, "logStashImage");
     loadFromMap(map, this::setElasticSearchHost, "elasticSearchHost");
+    loadFromMap(map, this::setJvmOptions, "jvmOptions");
 
     loadBooleanFromMap(map, this::setExternalRestEnabled, "externalRestEnabled");
     loadBooleanFromMap(map, this::setRemoteDebugNodePortEnabled, "remoteDebugNodePortEnabled");
@@ -114,6 +115,7 @@ Map<String, Object> createMap() {
     addStringMapEntry(map, this::getExternalOperatorKey, "externalOperatorKey");
     addStringMapEntry(map, this::getLogStashImage, "logStashImage");
     addStringMapEntry(map, this::getElasticSearchHost, "elasticSearchHost");
+    addStringMapEntry(map, this::getJvmOptions, "jvmOptions");
 
     addMapEntry(map, this::isRestEnabled, "enableRest");
     addMapEntry(map, this::isExternalRestEnabled, "externalRestEnabled");