Checkstyle and merge issues

Author: rjeberhard

docs/charts/index.yaml

@@ -1,39 +1,39 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-06-21T17:07:47.254382-04:00
+  - created: "2019-07-25T14:26:55.411022-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: 0af0ca39bf33b38d82a22a21c32e1cb3da3f78d841ba2c4cfaa4c0e743d3b9b3
+    digest: 755825da5adcc30f57bca540509813aeb8d73ddd69d85e4f30b29d73696e2ee8
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
-  - created: 2019-06-21T17:07:47.252194-04:00
+  - created: "2019-07-25T14:26:55.408716-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
-  - created: 2019-06-21T17:07:47.250143-04:00
+  - created: "2019-07-25T14:26:55.407036-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
-  - created: 2019-06-21T17:07:47.246971-04:00
+  - created: "2019-07-25T14:26:55.405384-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
-  - created: 2019-06-21T17:07:47.245138-04:00
+  - created: "2019-07-25T14:26:55.403824-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: 2019-06-21T17:07:47.24317-04:00
+generated: "2019-07-25T14:26:55.401818-04:00"

docs/charts/weblogic-operator-2.3.0.tgz

@@ -148,3 +148,14 @@ Configuration Overrides Usecases
 | Pod Templates | Use Case |
 | --- | --- |
 | Using pod templates/variables | Use DOMAIN_UID, DOMAIN_NAME, DOMAIN_HOME, SERVER_NAME, LOG_HOME variables at domain level and CLUSTER_NAME at cluster level. Bring up the domain and make sure domain started successfully when pod templates are used |
+
+| Init Container | Use Case |
+| --- | --- |
+| Add initContainers to domain | Add a initContainers object to spec level and verify the init containers are created for weblogic server pods prior to starting it and runs to completion and then weblogic pod are started |
+| Add initContainers to adminServer | Add a initContainers object to adminServer level and verify the init container is created for administration server weblogic server pod prior to starting it and runs to completion and then weblogic pod is started |
+| Add initContainers to Clusters | Add a initContainers object to Clusters level and verify the init containers are created for weblogic server pods prior to starting the clusters and runs to completion and then weblogic pod are started |
+| Add initContainers to managedServers | Add a initContainers object to managed server level and verify the init container is created for managed server weblogic server pod prior to starting it and runs to completion and then weblogic pod is started |
+| Add bad initContainers to domain | Add a bad initContainers object to domain and verify the init container run fails and no weblogic pod is started |
+| Add multiple initContainers to domain | Add multiple initContainers object to domain level and verify all of the init container are run before weblogic server pod are started |
+| Add initContainers with different names at different level | Add a multiple initContainers object at domain level and server level and verify all of the init containers are run before weblogic server pods are started |
+| Add initContainers with same names at different level | Add a multiple initContainers object at domain level and server level and verify only the server level init containers are run before weblogic server pods are started |

integration-tests/USECASES.MD

@@ -6,6 +6,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.Map;
 import java.util.Properties;
 import java.util.logging.FileHandler;
@@ -687,14 +688,7 @@ public void testWldfScaling(Operator operator, Domain domain) throws Exception {
     String adminPodName = domainUid + "-" + adminServerName;
     String domainName = (String) domainMap.get("domainName");
 
-    String scriptsDir =
-        "/scratch/acceptance_test_pv/persistentVolume-"
-            + domainUid
-            + "/domains/"
-            + domainUid
-            + "/bin/scripts";
-
-    copyScalingScriptToPod(scriptsDir, domainUid, adminPodName, domainNS);
+    copyScalingScriptToPod(domainUid, adminPodName, domainNS);
     TestUtils.createRbacPoliciesForWldfScaling();
 
     // deploy opensessionapp
@@ -752,18 +746,23 @@ protected void logTestBegin(String testName) throws Exception {
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
   }
 
-  private void copyScalingScriptToPod(
-      String dirPathToCreate, String domainUid, String podName, String domainNS) throws Exception {
+  private void copyScalingScriptToPod(String domainUid, String podName, String domainNS)
+      throws Exception {
+
+    String pvDir = BaseTest.getPvRoot() + "/acceptance_test_pv/persistentVolume-" + domainUid;
+    String scriptsDir = pvDir + "/domains/" + domainUid + "/bin/scripts";
 
     // create scripts dir under domain pv
-    TestUtils.createDirUnderDomainPV(dirPathToCreate);
-
+    TestUtils.createDirUnderDomainPV(scriptsDir);
+    // workaround for the issue with not allowing .. in the host-path in krun.sh
+    Files.copy(Paths.get(getProjectRoot() + "/src/scripts/scaling/scalingAction.sh"),
+        Paths.get(getResultDir() + "/scalingAction.sh"), StandardCopyOption.REPLACE_EXISTING);
     // copy script to pod
-    TestUtils.copyFileViaCat(
-        getProjectRoot() + "/src/scripts/scaling/scalingAction.sh",
-        "/shared/domains/" + domainUid + "/bin/scripts/scalingAction.sh",
-        podName,
-        domainNS);
+    String cpUsingKrunCmd = getProjectRoot() + "/src/integration-tests/bash/krun.sh -m "
+        + getResultDir() + ":/tmpdir -m " + pvDir
+        + ":/pvdir -c 'cp -f /tmpdir/scalingAction.sh /pvdir/domains/domainonpvwdt/bin/scripts' -n "
+        + domainNS;
+    TestUtils.exec(cpUsingKrunCmd, true);
   }
 
   private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exception {