Merge pull request #648 from oracle/OWLS-70593

OWLS-70593: OPERATOR: CUSTOM OVERRIDE CONFIG MAP DOES NOT TAKE EFFECT WHEN DYNAMICALLY ADDED

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

@@ -111,11 +111,11 @@ void addEnvironmentVariable(String name, String value) {
     serverPod.addEnvVar(new V1EnvVar().name(name).value(value));
   }
 
-  void setServerStartPolicy(String serverStartPolicy) {
+  public void setServerStartPolicy(String serverStartPolicy) {
     this.serverStartPolicy = serverStartPolicy;
   }
 
-  protected String getServerStartPolicy() {
+  public String getServerStartPolicy() {
     return serverStartPolicy;
   }
 

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -440,7 +440,7 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
 
   @Nullable
   @Override
-  protected String getServerStartPolicy() {
+  public String getServerStartPolicy() {
     return Optional.ofNullable(super.getServerStartPolicy()).orElse(START_IF_NEEDED);
   }
 

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

@@ -30,6 +30,7 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.v2.Cluster;
+import oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import oracle.kubernetes.weblogic.domain.v2.ManagedServer;
@@ -174,18 +175,42 @@ private static boolean creatingServers(DomainPresenceInfo info) {
     List<ManagedServer> servers = spec.getManagedServers();
 
     // Are we starting a cluster?
+    // NOTE: clusterServerStartPolicy == null indicates default policy
     for (Cluster cluster : clusters) {
       int replicaCount = cluster.getReplicas();
-      LOGGER.fine("creatingServers replicaCount: " + replicaCount + " for cluster: " + cluster);
-      if (replicaCount > 0) {
+      String clusterServerStartPolicy = cluster.getServerStartPolicy();
+      LOGGER.fine(
+          "Start Policy: "
+              + clusterServerStartPolicy
+              + ", replicaCount: "
+              + replicaCount
+              + " for cluster: "
+              + cluster);
+      if ((clusterServerStartPolicy == null
+              || !clusterServerStartPolicy.equals(ConfigurationConstants.START_NEVER))
+          && replicaCount > 0) {
         return true;
       }
     }
 
-    // Are we starting a standalone managed server?
-    // for (ManagedServer server : servers.values()) {
-    // if (server.)
-    // }
+    // If Domain level Server Start Policy = ALWAYS, IF_NEEDED or ADMIN_ONLY then we most likely
+    // will start a server pod
+    // NOTE: domainServerStartPolicy == null indicates default policy
+    String domainServerStartPolicy = dom.getSpec().getServerStartPolicy();
+    if (domainServerStartPolicy == null
+        || !domainServerStartPolicy.equals(ConfigurationConstants.START_NEVER)) {
+      return true;
+    }
+
+    // Are we starting any explicitly specified individual server?
+    // NOTE: serverStartPolicy == null indicates default policy
+    for (ManagedServer server : servers) {
+      String serverStartPolicy = server.getServerStartPolicy();
+      if (serverStartPolicy == null
+          || !serverStartPolicy.equals(ConfigurationConstants.START_NEVER)) {
+        return true;
+      }
+    }
 
     return false;
   }

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

@@ -128,7 +128,7 @@ public static Collection<String> getRunningServers(DomainPresenceInfo info) {
     Collection<String> runningList = new ArrayList<>();
     for (Map.Entry<String, ServerKubernetesObjects> entry : info.getServers().entrySet()) {
       ServerKubernetesObjects sko = entry.getValue();
-      if (sko != null && sko.getPod() != null) {
+      if (sko != null && sko.getPod().get() != null) {
         runningList.add(entry.getKey());
       }
     }

operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java

@@ -30,6 +30,7 @@
 import oracle.kubernetes.operator.work.FiberTestSupport;
 import oracle.kubernetes.operator.work.TerminalStep;
 import oracle.kubernetes.weblogic.domain.v2.Cluster;
+import oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.hamcrest.Matcher;
@@ -158,6 +159,7 @@ private DomainSpec createDomainSpec() {
     Cluster cluster = new Cluster();
     cluster.setClusterName("cluster-1");
     cluster.setReplicas(1);
+    cluster.setServerStartPolicy(ConfigurationConstants.START_IF_NEEDED);
     DomainSpec spec =
         new DomainSpec()
             .withDomainUID(UID)
@@ -166,6 +168,7 @@ private DomainSpec createDomainSpec() {
             .withCluster(cluster)
             .withImage(LATEST_IMAGE)
             .withDomainHomeInImage(false);
+    spec.setServerStartPolicy(ConfigurationConstants.START_IF_NEEDED);
 
     List<String> overrideSecrets = new ArrayList<>();
     overrideSecrets.add(OVERRIDE_SECRET_1);