Merge pull request #378 from oracle/JIRA-OWLS-65671

OWLS-67651: WLS cluster is unstable when startupControl …

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -123,7 +123,7 @@ private MessageKeys() {}
   public static final String RESTART_SERVERS_STARTING = "WLSKO-0116";
   public static final String ROLLING_CLUSTERS_STARTING = "WLSKO-0117";
   public static final String CYCLING_SERVERS = "WLSKO-0118";
-  public static final String ROLLING_SERVERS = "WLSKO-0118";
+  public static final String ROLLING_SERVERS = "WLSKO-0119";
   public static final String REMOVING_INGRESS = "WLSKO-0120";
   public static final String LIST_INGRESS_FOR_DOMAIN = "WLSKO-0121";
   public static final String POD_DELETED = "WLSKO-0122";

operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServersUpStep.java

@@ -168,6 +168,13 @@ public NextAction apply(Packet packet) {
               String serverName = wlsServerConfig.getListenAddress();
               // do not start admin server
               if (!serverName.equals(asName) && !servers.contains(serverName)) {
+                List<V1EnvVar> env = null;
+                // find ClusterStartup for WlsClusterConfig
+                ClusterStartup cs = findClusterStartup(wlsClusterConfig.getClusterName(), lcs);
+                if (cs != null) {
+                  env = cs.getEnv();
+                }
+
                 // start server
                 servers.add(serverName);
                 ssic.add(new ServerStartupInfo(wlsServerConfig, wlsClusterConfig, null, null));
@@ -222,6 +229,26 @@ public NextAction apply(Packet packet) {
     }
   }
 
+  /**
+   * Find corresponding ClusterStartup for WLS cluster, if defined.
+   *
+   * @param wlsClusterName - name of WLS cluster
+   * @param lcs - List of defined ClusterStartup's
+   * @return - ClusterStartup, if exists, or Null
+   */
+  private static ClusterStartup findClusterStartup(
+      String wlsClusterName, List<ClusterStartup> lcs) {
+    if (lcs != null) {
+      for (ClusterStartup cs : lcs) {
+        String clusterName = cs.getClusterName();
+        if (clusterName.equals(wlsClusterName)) {
+          return cs;
+        }
+      }
+    }
+    return null;
+  }
+
   private static List<V1EnvVar> startInAdminMode(List<V1EnvVar> env) {
     if (env == null) {
       env = new ArrayList<>();