Merge remote-tracking branch 'origin/testpodtemplates' into cluster-template

Author: rjeberhard

integration-tests/src/test/java/oracle/kubernetes/operator/ItPodTemplates.java

@@ -13,17 +13,17 @@
 import java.util.Map;
 import java.util.logging.Level;
 
-import oracle.kubernetes.operator.utils.Domain;
-import oracle.kubernetes.operator.utils.DomainCrd;
-import oracle.kubernetes.operator.utils.ExecResult;
-import oracle.kubernetes.operator.utils.Operator;
-import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
-import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
+import org.junit.Assume;
 import org.junit.runners.MethodSorters;
+import oracle.kubernetes.operator.utils.Domain;
+import oracle.kubernetes.operator.utils.DomainCrd;
+import oracle.kubernetes.operator.utils.ExecResult;
+import oracle.kubernetes.operator.utils.Operator;
+import oracle.kubernetes.operator.utils.TestUtils;
 
 /**
  * Simple JUnit test file used for testing domain pod templates.

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -1249,7 +1249,7 @@ protected void callCreateDomainScript(String outputDir) throws Exception {
 
     // write configOverride and configOverrideSecrets to domain.yaml and/or create domain
     if (domainMap.containsKey("configOverrides") || domainMap.containsKey("domainHomeImageBase")
-        || createDomainResource) {
+        || !createDomainResource) {
       appendToDomainYamlAndCreate();
     }
   }