Fix managed server env vars

Author: moreaut

src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java

@@ -722,6 +722,10 @@ protected V1Pod computeManagedPodConfig(Packet packet) {
         }
       }
 
+      // Override the weblogic domain and admin server related environment variables that
+      // come for free with the WLS docker container with the correct values.
+      overrideContainerWeblogicEnvVars(spec, weblogicServerName, container);
+
       return pod;
     }
   }

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

@@ -350,41 +350,18 @@ private V1Pod getDesiredAdminServerPodConfigForDefaults(String image, String ima
     V1Pod pod = getDesiredBaseServerPodConfigForDefaults(image, imagePullPolicy, ADMIN_SERVER_NAME, ADMIN_SERVER_PORT);
     pod.getSpec()
       .hostname(DOMAIN_UID + "-" + ADMIN_SERVER_NAME.toLowerCase());
-    pod.getSpec().getContainers().get(0)
-      .addEnvItem(newEnvVar()
+    pod.getSpec().getContainers().get(0).getEnv().add(0, newEnvVar()
         .name("INTERNAL_OPERATOR_CERT")
-        .value(INTERNAL_OPERATOR_CERT_FILE))
-      .addEnvItem(newEnvVar()
-        .name("DOMAIN_NAME")
-        .value(DOMAIN_NAME))
-      .addEnvItem(newEnvVar()
-        .name("DOMAIN_HOME")
-        .value("/shared/domain/" + DOMAIN_NAME))
-      .addEnvItem(newEnvVar()
-        .name("ADMIN_NAME")
-        .value(ADMIN_SERVER_NAME))
-      .addEnvItem(newEnvVar()
-        .name("ADMIN_PORT")
-        .value("" + ADMIN_SERVER_PORT))
-      .addEnvItem(newEnvVar()
-        .name("SERVER_NAME")
-        .value(ADMIN_SERVER_NAME))
-      .addEnvItem(newEnvVar()
-        .name("ADMIN_USERNAME")
-        .value(null))
-      .addEnvItem(newEnvVar()
-        .name("ADMIN_PASSWORD")
-        .value(null));
+        .value(INTERNAL_OPERATOR_CERT_FILE));
     return pod;
   }
 
   private V1Pod getDesiredManagedServerPodConfigForDefaults(String image, String imagePullPolicy) {
     V1Pod pod = getDesiredBaseServerPodConfigForDefaults(image, imagePullPolicy, MANAGED_SERVER_NAME, MANAGED_SERVER_PORT);
-    pod.getSpec().getContainers().get(0)
-      .addEnvItem(newEnvVar()
+    pod.getSpec().getContainers().get(0).getEnv().add(0, newEnvVar()
         .name(MANAGED_OPTION1_NAME)
-        .value(MANAGED_OPTION1_VALUE))
-      .addEnvItem(newEnvVar()
+        .value(MANAGED_OPTION1_VALUE));
+    pod.getSpec().getContainers().get(0).getEnv().add(1, newEnvVar()
         .name(MANAGED_OPTION2_NAME)
         .value(MANAGED_OPTION2_VALUE));
     pod.getMetadata()
@@ -446,6 +423,27 @@ private V1Pod getDesiredBaseServerPodConfigForDefaults(String image, String imag
             .addPortsItem(newContainerPort()
               .containerPort(port)
                 .protocol("TCP"))
+            .addEnvItem(newEnvVar()
+              .name("DOMAIN_NAME")
+              .value(DOMAIN_NAME))
+            .addEnvItem(newEnvVar()
+              .name("DOMAIN_HOME")
+              .value("/shared/domain/" + DOMAIN_NAME))
+            .addEnvItem(newEnvVar()
+              .name("ADMIN_NAME")
+              .value(ADMIN_SERVER_NAME))
+            .addEnvItem(newEnvVar()
+              .name("ADMIN_PORT")
+              .value("" + ADMIN_SERVER_PORT))
+            .addEnvItem(newEnvVar()
+              .name("SERVER_NAME")
+              .value(serverName))
+            .addEnvItem(newEnvVar()
+              .name("ADMIN_USERNAME")
+              .value(null))
+            .addEnvItem(newEnvVar()
+              .name("ADMIN_PASSWORD")
+              .value(null))
             .addVolumeMountsItem(newVolumeMount() // TBD - why is the mount created if the volume doesn't exist?
               .name("pv-storage")
               .mountPath("/shared"))