Merge branch 'develop' into owls-70659

Author: alai8

README.md

@@ -52,7 +52,7 @@ The [User guide](site/user-guide.md) provides detailed information about all asp
 
 # Samples
 
-**TODO** put a list of samples here with a summary and links
+Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code we provide.
 
 # Developer guide
 

integration-tests/pom.xml

@@ -59,12 +59,12 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.1-jre</version>
+			<version>${guava-version}</version>
 		</dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.21</version>            
+            <version>${snakeyaml-version}</version>
         </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>

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

@@ -4,6 +4,9 @@
 
 package oracle.kubernetes.operator;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -46,6 +49,7 @@ public class ITOperator extends BaseTest {
   private static String domain9YamlFile = "domain9.yaml";
   private static String domain10YamlFile = "domain10.yaml";
   private static String domain11YamlFile = "domain11.yaml";
+  private static String domain12YamlFile = "domain12.yaml";
 
   // property file used to configure constants for integration tests
   private static String appPropsFile = "OperatorIT.properties";
@@ -138,8 +142,7 @@ public void test1CreateFirstOperatorAndDomain() throws Exception {
       if (!SMOKETEST) domain1.testWlsLivenessProbe();
       testCompletedSuccessfully = true;
     } finally {
-
-      if (domain1 != null && (JENKINS || testCompletedSuccessfully))
+      if (domain1 != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))
         domain1.shutdownUsingServerStartPolicy();
     }
 
@@ -251,7 +254,7 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
       logger.info("Verify no impact on domain5");
       domain5.verifyDomainCreated();
       testCompletedSuccessfully = true;
-      logger.info("SUCCESS - test5CreateConfiguredDomainInTest2NS");
+
     } finally {
       if (domain4 != null && (JENKINS || testCompletedSuccessfully)) {
         domain4.destroy();
@@ -260,6 +263,7 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
         domain5.destroy();
       }
     }
+    logger.info("SUCCESS - test5CreateConfiguredDomainInTest2NS");
   }
 
   @Test
@@ -459,7 +463,7 @@ public void testDeleteTwoDomains() throws Exception {
     logger.info("SUCCESS - testDeleteTwoDomains");
   }
 
-  // @Test
+  @Test
   public void testAutoSitConfigOverrides() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     logTestBegin("testAutoSitConfigOverrides");
@@ -469,32 +473,78 @@ public void testAutoSitConfigOverrides() throws Exception {
     }
     Domain domain11 = null;
     boolean testCompletedSuccessfully = false;
+    String createDomainScriptDir =
+        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv";
     try {
+
       // cp py
-      copyCreateDomainScript();
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py.bak").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain-auto-sit-config.py").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
+
       domain11 = testDomainCreation(domain11YamlFile);
       domain11.verifyDomainCreated();
       testBasicUseCases(domain11);
+      // testAdvancedUseCasesForADomain(operator1, domain11);
       testCompletedSuccessfully = true;
       logger.info("SUCCESS - testAutoSitConfigOverrides");
     } finally {
-
-      StringBuffer cmd = new StringBuffer("cd ");
-      cmd.append(BaseTest.getProjectRoot())
-          .append(
-              "/integration-tests/src/test/resources/domain-home-on-pv && cp create-domain.py.bak create-domain.py");
-      logger.info("Running " + cmd);
-      ExecResult result = ExecCommand.exec(cmd.toString());
-      if (result.exitValue() != 0) {
-        throw new RuntimeException(cmd + " failed");
-      }
-
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain.py.bak").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
       if (domain11 != null && (JENKINS || testCompletedSuccessfully)) {
         domain11.destroy();
       }
     }
   }
 
+  // @Test
+  public void testCustomSitConfigOverrides() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
+    logTestBegin("testCustomSitConfigOverrides");
+
+    if (operator1 == null) {
+      operator1 = TestUtils.createOperator(op1YamlFile);
+    }
+    Domain domain12 = null;
+    boolean testCompletedSuccessfully = false;
+    String createDomainScriptDir =
+        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv";
+    try {
+
+      // cp py
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py.bak").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain-custom-sit-config.py").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
+
+      domain12 = testDomainCreation(domain12YamlFile);
+      domain12.verifyDomainCreated();
+      testBasicUseCases(domain12);
+      // testAdvancedUseCasesForADomain(operator1, domain11);
+      testCompletedSuccessfully = true;
+      logger.info("SUCCESS - testCustomSitConfigOverrides");
+    } finally {
+      Files.copy(
+          new File(createDomainScriptDir + "/create-domain.py.bak").toPath(),
+          new File(createDomainScriptDir + "/create-domain.py").toPath(),
+          StandardCopyOption.REPLACE_EXISTING);
+      if (domain12 != null && (JENKINS || testCompletedSuccessfully)) {
+        domain12.destroy();
+      }
+    }
+  }
+
   private Domain testAdvancedUseCasesForADomain(Operator operator, Domain domain) throws Exception {
     if (!SMOKETEST) {
       testClusterScaling(operator, domain);
@@ -512,27 +562,4 @@ private void testBasicUseCases(Domain domain) throws Exception {
     testAdminT3Channel(domain);
     testAdminServerExternalService(domain);
   }
-
-  private void copyCreateDomainScript() throws Exception {
-    String createDomainScriptPath =
-        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv";
-
-    StringBuffer cmd = new StringBuffer("cd ");
-    cmd.append(createDomainScriptPath).append(" && cp create-domain.py create-domain.py.bak");
-    logger.info("Running " + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd.toString());
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(cmd + " failed");
-    }
-
-    cmd = new StringBuffer("cd ");
-    cmd.append(createDomainScriptPath)
-        .append(" && cp create-domain-auto-sit-config.py create-domain.py");
-    logger.info("Running " + cmd);
-    result = ExecCommand.exec(cmd.toString());
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(cmd + " failed");
-    }
-  }
 }

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

@@ -10,6 +10,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -668,11 +669,14 @@ private void generateInputYaml() throws Exception {
 
   private void callCreateDomainScript(String outputDir) throws Exception {
     StringBuffer cmd = new StringBuffer(BaseTest.getProjectRoot());
+
     cmd.append(
             "/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain.sh -i ")
-        .append(generatedInputYamlFile)
-        .append(" -e -v -o ")
-        .append(outputDir);
+        .append(generatedInputYamlFile);
+    if (!domainMap.containsKey("configOverrides")) {
+      cmd.append(" -e ");
+    }
+    cmd.append(" -v -o ").append(outputDir);
     logger.info("Running " + cmd);
     ExecResult result = ExecCommand.exec(cmd.toString(), true);
     if (result.exitValue() != 0) {
@@ -686,6 +690,37 @@ private void callCreateDomainScript(String outputDir) throws Exception {
     }
     String outputStr = result.stdout().trim();
     logger.info("Command returned " + outputStr);
+
+    // write configOverride and configOverrideSecrets to domain.yaml
+    if (domainMap.containsKey("configOverrides")) {
+      String contentToAppend =
+          "  configOverrides: "
+              + domainUid
+              + "-"
+              + domainMap.get("configOverrides")
+              + "\n"
+              + "  configOverrideSecrets: [ \""
+              + domainUid
+              + "-t3publicaddress\" ]"
+              + "\n";
+
+      String domainYaml =
+          BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
+      Files.write(Paths.get(domainYaml), contentToAppend.getBytes(), StandardOpenOption.APPEND);
+
+      String command = "kubectl create -f " + domainYaml;
+      result = ExecCommand.exec(command);
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command "
+                + cmd
+                + " failed, returned "
+                + result.stdout()
+                + "\n"
+                + result.stderr());
+      }
+      logger.info("Command returned " + result.stdout().trim());
+    }
   }
 
   private void createLoadBalancer() throws Exception {
@@ -790,7 +825,12 @@ private void callWebAppAndCheckForServerNameInResponse(
       ExecResult result = ExecCommand.exec(curlCmd.toString());
       if (result.exitValue() != 0) {
         throw new RuntimeException(
-            "FAILURE: command " + curlCmd + " failed, returned " + result.stderr());
+            "FAILURE: command "
+                + curlCmd
+                + " failed, returned "
+                + result.stderr()
+                + " \n "
+                + result.stdout());
       } else {
         logger.info("webapp invoked successfully");
       }
@@ -863,9 +903,9 @@ private void initialize(String inputYaml) throws Exception {
     }
 
     domainMap.put("domainHome", "/shared/domains/" + domainUid);
-    /* domainMap.put(
-    "createDomainFilesDir",
-    BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv"); */
+    domainMap.put(
+        "createDomainFilesDir",
+        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/domain-home-on-pv");
     String imageName = "store/oracle/weblogic";
     if (System.getenv("IMAGE_NAME_WEBLOGIC") != null) {
       imageName = System.getenv("IMAGE_NAME_WEBLOGIC");
@@ -889,6 +929,56 @@ private void initialize(String inputYaml) throws Exception {
     }
     // remove null values if any attributes
     domainMap.values().removeIf(Objects::isNull);
+
+    // create config map and secret for custom sit config
+    if (domainMap.get("configOverrides") != null) {
+      // write hostname in config file for public address
+
+      String cmd =
+          "kubectl -n "
+              + domainNS
+              + " create cm "
+              + domainUid
+              + "-"
+              + domainMap.get("configOverrides")
+              + " --from-file "
+              + BaseTest.getProjectRoot()
+              + "/integration-tests/src/test/resources/domain-home-on-pv/customsitconfig";
+      ExecResult result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+      }
+      cmd =
+          "kubectl -n "
+              + domainNS
+              + " label cm "
+              + domainUid
+              + "-"
+              + domainMap.get("configOverrides")
+              + " weblogic.domainUID="
+              + domainUid;
+      result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+      }
+      // create secret for custom sit config t3 public address
+      cmd =
+          "kubectl -n "
+              + domainNS
+              + " create secret generic "
+              + domainUid
+              + "-"
+              + "t3publicaddress "
+              + " --from-literal=hostname="
+              + TestUtils.getHostName();
+      result = ExecCommand.exec(cmd);
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+      }
+    }
   }
 
   private String getNodeHost() throws Exception {

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

@@ -230,7 +230,7 @@ private void generateInputYaml() throws Exception {
     // write certificates
     ExecCommand.exec(
         BaseTest.getProjectRoot()
-            + "/kubernetes/samples/scripts/generate-external-rest-identity.sh "
+            + "/kubernetes/samples/scripts/rest/generate-external-rest-identity.sh "
             + "DNS:"
             + TestUtils.getHostName()
             + " >> "