Revert "Revert some changes since env at domain level does not seem to work"

This reverts commit 84f5262.

Author: doxiao

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

@@ -147,6 +147,12 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "IF_NEEDED"
+  # an (optional) list of environment variable to be set on the servers
+  env:
+  - name: JAVA_OPTIONS
+    value: "-Dweblogic.StdoutDebugEnabled=false"
+  - name: USER_MEM_ARGS
+    value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -158,23 +164,12 @@ spec:
     # Uncomment to export the T3Channel as a service
     # exportedNetworkAccessPoints:
     #   T3Channel: {}
-    # an (optional) list of environment variable to be set on the server
-    env:
-    - name: JAVA_OPTIONS
-      value: "-Dweblogic.StdoutDebugEnabled=false"
-    - name: USER_MEM_ARGS
-      value: "-Xms64m -Xmx256m "
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
     cluster-1:
       desiredState: "RUNNING"
       replicas: 2
-      env:
-      - name: JAVA_OPTIONS
-        value: "-Dweblogic.StdoutDebugEnabled=false"
-      - name: USER_MEM_ARGS
-        value: "-Xms64m -Xmx256m "
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
 

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml

@@ -44,6 +44,12 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
+  # an (optional) list of environment variable to be set on the servers
+  env:
+  - name: JAVA_OPTIONS
+    value: "%JAVA_OPTIONS%"
+  - name: USER_MEM_ARGS
+    value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -55,22 +61,11 @@ spec:
     # Uncomment to export the T3Channel as a service
     %EXPOSE_T3_CHANNEL_PREFIX%exportedNetworkAccessPoints:
     %EXPOSE_T3_CHANNEL_PREFIX%  T3Channel: {}
-    # an (optional) list of environment variable to be set on the server
-    env:
-    - name: JAVA_OPTIONS
-      value: "%JAVA_OPTIONS%"
-    - name: USER_MEM_ARGS
-      value: "-Xms64m -Xmx256m "
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
     %CLUSTER_NAME%:
       serverStartState: "RUNNING"
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
-      env:
-      - name: JAVA_OPTIONS
-        value: "%JAVA_OPTIONS%"
-      - name: USER_MEM_ARGS
-        value: "-Xms64m -Xmx256m "
   # The number of managed servers to start from clusters not listed in clusters
   # replicas: 1

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

@@ -163,6 +163,12 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "IF_NEEDED"
+  # an (optional) list of environment variable to be set on the servers
+  env:
+  - name: JAVA_OPTIONS
+    value: "-Dweblogic.StdoutDebugEnabled=false"
+  - name: USER_MEM_ARGS
+    value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -175,22 +181,12 @@ spec:
     exportedNetworkAccessPoints:
       T3Channel: {}
     # an (optional) list of environment variable to be set on the server
-    env:
-    - name: JAVA_OPTIONS
-      value: "-Dweblogic.StdoutDebugEnabled=false"
-    - name: USER_MEM_ARGS
-      value: "-Xms64m -Xmx256m "
   # clusters is used to configure the desired behavior for starting member servers of a cluster.
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
     cluster-1:
       serverStartState: "RUNNING"
       replicas: 2
-      env:
-      - name: JAVA_OPTIONS
-        value: "-Dweblogic.StdoutDebugEnabled=false"
-      - name: USER_MEM_ARGS
-        value: "-Xms64m -Xmx256m "
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
   storage:

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml

@@ -53,7 +53,7 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
-  # an (optional) list of environment variable to be set on the server
+  # an (optional) list of environment variable to be set on the servers
   env:
   - name: JAVA_OPTIONS
     value: "%JAVA_OPTIONS%"