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

Author: rjeberhard

docs-source/content/quickstart/get-images.md

@@ -19,7 +19,7 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
 1. Pull the operator image:
 
     ```bash
-    $ docker pull oracle/weblogic-kubernetes-operator:2.2.0
+    $ docker pull oracle/weblogic-kubernetes-operator:2.2.1
     ```
 
 1. Pull the Traefik load balancer image:

docs-source/content/quickstart/install.md

@@ -57,7 +57,7 @@ $ helm install stable/traefik \
     $ helm install kubernetes/charts/weblogic-operator \
       --name sample-weblogic-operator \
       --namespace sample-weblogic-operator-ns \
-      --set image=oracle/weblogic-kubernetes-operator:2.2.0 \
+      --set image=oracle/weblogic-kubernetes-operator:2.2.1 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "domainNamespaces={}" \
       --wait

docs-source/content/userguide/introduction/architecture.md

@@ -18,7 +18,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
 
 ```
 $ docker login
-$ docker pull oracle/weblogic-kubernetes-operator:2.2.0
+$ docker pull oracle/weblogic-kubernetes-operator:2.2.1
 ```
 
 For more details on acquiring the operator image and prerequisites for installing the operator, consult the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}).

docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md

@@ -161,7 +161,7 @@ d. Update the `image` property of the domain resource specifying the new image n
      ```
         domain:
               spec:
-                   image: oracle/weblogic-updated:2.2
+                   image: oracle/weblogic-updated:2.2.1
      ```
 e. The operator will now initiate a rolling restart, which will apply the updated image, for all the server pods in the domain.
 

docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md

@@ -101,7 +101,7 @@ javaLoggingLevel:  "FINE"
 
 Specifies the Docker image containing the operator code.
 
-Defaults to `weblogic-kubernetes-operator:2.2.0`.
+Defaults to `weblogic-kubernetes-operator:2.2.1`.
 
 Example:
 ```
@@ -119,7 +119,7 @@ image:  "Always"
 ```
 
 ##### `imagePullSecrets`
-Contains an optional list of Kubernetes secrets, in the operator's namepace, that are needed to access the registry containing the operator Docker image. You are responsible for creating the secret. If no secrets are required, then omit this property.
+Contains an optional list of Kubernetes secrets, in the operator's namespace, that are needed to access the registry containing the operator Docker image. You are responsible for creating the secret. If no secrets are required, then omit this property.
 
 Example:
 ```

integration-tests/USECASES.MD

@@ -43,7 +43,7 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Domain | Use Case |
 | --- | --- |
 | Domain on PV using WDT | WLDF scaling |
-| Domain with ADMIN_ONLY | making sure only admin server is started and managed servers are not started. Shutdown domain by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a shutdown domain. |
+| Domain with ADMIN_ONLY | making sure only admin server is started and managed servers are not started. Make some changes in domain configuration by changing admin server tuning backlog configuration and restart domain. Shutdown domain by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a shutdown domain. |
 | Domain with situational config | create domain with listen address not set for admin server and t3 channel/NAP and incorrect file for admin server log location. Introspector should override these with sit-config automatically. Also, with some junk value for t3 channel public address and using custom situational config override replace with valid public address using secret. Also, on Jenkins this domain uses NFS instead of HOSTPATH PV storage |	
 | Two domains managed by two operators | verify scaling and restart of one domain doesn't impact another domain. Delete domain resources using delete script from samples. |			
 | Domain with Recycle policy | create domain with pvReclaimPolicy="Recycle" and using Configured cluster. Verify that the PV is deleted once the domain and PVC are deleted |

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

@@ -234,6 +234,10 @@ public void testWeblogicLogSearch() throws Exception {
     String managedServerNameBase = domainMap.get("managedServerNameBase").toString();
     String managedServerPodName = domainUid + "-" + managedServerNameBase + "1";
 
+    // Wait 30 seconds for WLS log to be pushed to ELK Stack
+    logger.info("Wait 30 seconds for WLS log to be pushed to ELK Stack");
+    Thread.sleep(30 * 1000);
+
     // Verify that log hits for admin server are not empty
     String regex = ".*took\":(\\d+),.*hits\":\\{(.+)\\}";
     String queryCriteria = "/_search?q=log:" + adminServerPodName + " | grep RUNNING";

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

@@ -235,8 +235,9 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
 
   /**
    * Create operator if its not running and create domain with serverStartPolicy="ADMIN_ONLY".
-   * Verify only admin server is created. shutdown by deleting domain CRD. Create domain on existing
-   * PV dir, pv is already populated by a shutdown domain.
+   * Verify only admin server is created. Make domain configuration change and restart the domain.
+   * shutdown by deleting domain CRD. Create domain on existing PV dir, pv is already populated by a
+   * shutdown domain.
    *
    * @throws Exception exception
    */
@@ -255,6 +256,10 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
     try {
       domain = TestUtils.createDomain(DOMAIN_ADMINONLY_YAML);
       domain.verifyDomainCreated();
+      // change domain config by modifying accept backlog on adminserver tuning
+      modifyDomainConfig(domain);
+      domain.shutdownUsingServerStartPolicy();
+      domain.restartUsingServerStartPolicy();
     } finally {
       if (domain != null) {
         // create domain on existing dir
@@ -516,4 +521,28 @@ private Domain testAdvancedUseCasesForADomain(Operator operator, Domain domain)
     }
     return domain;
   }
+
+  private void modifyDomainConfig(Domain domain) throws Exception {
+    String adminPod = domain.getDomainUid() + "-" + domain.getAdminServerName();
+    String scriptsLocInPod = "/u01/oracle";
+    TestUtils.copyFileViaCat(
+        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/modifyAcceptBacklog.py",
+        scriptsLocInPod + "/modifyAcceptBacklog.py",
+        adminPod,
+        domain.getDomainNs());
+
+    TestUtils.copyFileViaCat(
+        BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/callpyscript.sh",
+        scriptsLocInPod + "/callpyscript.sh",
+        adminPod,
+        domain.getDomainNs());
+    String[] args = {
+      scriptsLocInPod + "/modifyAcceptBacklog.py",
+      BaseTest.getUsername(),
+      BaseTest.getPassword(),
+      "t3://" + adminPod + ":" + domain.getDomainMap().get("t3ChannelPort")
+    };
+    TestUtils.callShellScriptByExecToPod(
+        adminPod, domain.getDomainNs(), scriptsLocInPod, "callpyscript.sh", args);
+  }
 }

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

@@ -10,7 +10,6 @@
 import java.util.regex.Pattern;
 
 import oracle.kubernetes.operator.utils.Domain;
-import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
@@ -31,11 +30,8 @@
 public class ItSessionMigration extends BaseTest {
   private static final String testAppName = "httpsessionreptestapp";
   private static final String scriptName = "buildDeployAppInPod.sh";
-
   private static Map<String, String> httpAttrMap;
-
   private static String httpHeaderFile;
-
   private static Operator operator;
   private static Domain domain;
 
@@ -71,7 +67,6 @@ public static void staticPrepare() throws Exception {
       }
 
       httpHeaderFile = BaseTest.getResultDir() + "/headers";
-
       httpAttrMap = new HashMap<String, String>();
       httpAttrMap.put("sessioncreatetime", "(.*)sessioncreatetime>(.*)</sessioncreatetime(.*)");
       httpAttrMap.put("sessionid", "(.*)sessionid>(.*)</sessionid(.*)");
@@ -134,7 +129,7 @@ public void testRepickPrimary() throws Exception {
     String sessCreateTime1 = getHttpResponseAttribute(result.stdout(), sessCreateTime);
 
     // Stop primary server
-    stopPrimaryServer(primaryServName1);
+    domain.shutdownManagedServerUsingServerStartPolicy(primaryServName1);
 
     // Send the second HTTP request using HTTP header/sessionID info save before
     result = getHttpResponse(testAppPath, " -b ");
@@ -152,6 +147,7 @@ public void testRepickPrimary() throws Exception {
         primaryServName1.trim().equals(primaryServName2.trim()));
 
     // Restore test env
+    domain.restartManagedServerUsingServerStartPolicy(primaryServName1);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info(
@@ -190,7 +186,7 @@ public void testHttpSessionMigr() throws Exception {
     final String countattribute1 = getHttpResponseAttribute(result.stdout(), count);
 
     // Stop primary server
-    stopPrimaryServer(primaryServName1);
+    domain.shutdownManagedServerUsingServerStartPolicy(primaryServName1);
 
     // Send the second HTTP request using HTTP header/sessionID info save before
     result = getHttpResponse(webServiceGetUrl, " -b ");
@@ -210,6 +206,7 @@ public void testHttpSessionMigr() throws Exception {
         "HTTP session state is NOT migrated!", countattribute1.equals(countattribute2));
 
     // Restore test env
+    domain.restartManagedServerUsingServerStartPolicy(primaryServName1);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info("SUCCESS - " + testMethodName + ". HTTP session state is migrated!");
@@ -227,59 +224,22 @@ private ExecResult getHttpResponse(String webServiceUrl, String headerOption) th
     String curlCmd = buildWebServiceUrl(webServiceUrl, headerOption + httpHeaderFile);
     logger.info("Send a HTTP request: " + curlCmd);
 
-    ExecResult result = ExecCommand.exec(curlCmd);
-
-    if (result.exitValue() != 0) {
-      throw new Exception(
-          "FAILURE: command "
-              + curlCmd
-              + " failed, returned "
-              + result.stderr()
-              + "\n "
-              + result.stdout());
-    }
+    ExecResult result = TestUtils.exec(curlCmd);
 
     return result;
   }
 
-  /**
-   * Stop the primary server.
-   *
-   * @param primaryServerName - weblogic primary server name
-   * @throws Exception exception
-   */
-  private void stopPrimaryServer(String primaryServerName) throws Exception {
-    Map<String, Object> domainMap = domain.getDomainMap();
-    String domainNS = domainMap.get("namespace").toString();
-    String domainUid = domain.getDomainUid();
-
-    // stop primary server
-    String msPodName = domainUid + "-" + primaryServerName;
-    String cmd = "kubectl delete po/" + msPodName + " -n " + domainNS;
-    logger.info("Stop managed server <" + msPodName + "> using command:\n" + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      throw new Exception("FAILURE: command " + cmd + " failed, returned " + result.stderr());
-    }
-
-    logger.info(result.stdout());
-  }
-
   /**
    * Get the value of a HTTP attribute.
    *
    * @param httpResponseString - HTTP response
-   * @param attribute - attrubute name to find in the HTTP response
+   * @param attribute - attribute name to find in the HTTP response
    * @throws Exception exception
    */
   private String getHttpResponseAttribute(String httpResponseString, String attribute)
       throws Exception {
-
     String attrPatn = httpAttrMap.get(attribute);
-
     Assume.assumeNotNull(attrPatn);
-
     String httpAttribute = null;
 
     Pattern pattern = Pattern.compile(attrPatn);
@@ -317,28 +277,4 @@ private String buildWebServiceUrl(String curlUrlPath, String paramToAppend) thro
 
     return webServiceUrl.toString();
   }
-
-  /**
-   * Execute a given curl command and verify the results.
-   *
-   * @param curlCmd - a curl command to execute
-   * @throws Exception exception
-   */
-  private ExecResult execCurlCmd(String curlCmd) throws Exception {
-    logger.info("curl command to exec is:\n" + curlCmd);
-
-    ExecResult result = ExecCommand.exec(curlCmd);
-
-    if (result.exitValue() != 0) {
-      throw new Exception(
-          "FAILURE: command "
-              + curlCmd
-              + " failed, returned "
-              + result.stderr()
-              + "\n "
-              + result.stdout());
-    }
-
-    return result;
-  }
 }