Add Operator Upgrade Tests for Mii Domain (#2277)

xiancao · rjeberhard · web-flow · commit ce26a91933c2 · 2021-03-30T10:08:19.000-04:00
* add operator upgrade test for model-in-image domain

Co-authored-by: Ryan Eberhard &lt;ryan.eberhard@oracle.com&gt;
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgrade.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgrade.java
@@ -28,13 +28,17 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX;
+import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_GITHUB_CHART_REPO_URL;
@@ -48,6 +52,7 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.uninstallOperator;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.adminNodePortAccessible;
+import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.verifyPodsNotRolled;
 import static oracle.weblogic.kubernetes.utils.CommonPatchTestUtils.patchServerStartPolicy;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodDeleted;
@@ -71,7 +76,7 @@
 
 /**
  * Install a released version of Operator from GitHub chart repository.
- * Create a domain using Domain-In-Image model with a dynamic cluster.
+ * Create a domain using Domain-In-Image or Model-In-Image model with a dynamic cluster.
  * Deploy an application to the cluster in domain and verify the application 
  * can be accessed while the operator is upgraded and after the upgrade.
  * Upgrade operator with latest Operator image from develop branch.
@@ -124,7 +129,6 @@ public static void init() {
     withQuickRetryPolicy = with().pollDelay(0, SECONDS)
         .and().with().pollInterval(4, SECONDS)
         .atMost(10, SECONDS).await();
-
   }
 
   /**
@@ -133,52 +137,62 @@ public static void init() {
   @Test
   @DisplayName("Upgrade Operator from 2.6.0 to develop")
   public void testOperatorWlsUpgradeFrom260ToDevelop() {
-    upgradeOperator("2.6.0", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX,  false);
+    upgradeOperator("domain-in-image", "2.6.0", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX,  false);
   }
 
   /**
    * Operator upgrade from 3.0.3 to latest.
    */
-  @Test
+  @ParameterizedTest
   @DisplayName("Upgrade Operator from 3.0.3 to develop")
-  public void testOperatorWlsUpgradeFrom303ToDevelop() {
-    upgradeOperator("3.0.3", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
+  @ValueSource(strings = { "domain-in-image", "model-in-image" })
+  public void testOperatorWlsUpgradeFrom303ToDevelop(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom303ToDevelop with domain type {0}", domainType);
+    upgradeOperator(domainType, "3.0.3", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
   }
 
   /**
    * Operator upgrade from 3.0.4 to latest.
    */
-  @Test
+  @ParameterizedTest
   @DisplayName("Upgrade Operator from 3.0.4 to develop")
-  public void testOperatorWlsUpgradeFrom304ToDevelop() {
-    upgradeOperator("3.0.4", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
+  @ValueSource(strings = { "domain-in-image", "model-in-image" })
+  public void testOperatorWlsUpgradeFrom304ToDevelop(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom304ToDevelop with domain type {0}", domainType);
+    upgradeOperator(domainType, "3.0.4", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
   }
 
   /**
    * Operator upgrade from 3.1.2 to latest.
    */
-  @Test
+  @ParameterizedTest
   @DisplayName("Upgrade Operator from 3.1.2 to develop")
-  public void testOperatorWlsUpgradeFrom312ToDevelop() {
-    upgradeOperator("3.1.2", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
+  @ValueSource(strings = { "domain-in-image", "model-in-image" })
+  public void testOperatorWlsUpgradeFrom312ToDevelop(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom312ToDevelop with domain type {0}", domainType);
+    upgradeOperator(domainType, "3.1.2", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
   }
 
   /**
    * Operator upgrade from 3.1.3 to latest.
    */
-  @Test
+  @ParameterizedTest
   @DisplayName("Upgrade Operator from 3.1.3 to develop")
-  public void testOperatorWlsUpgradeFrom313ToDevelop() {
-    upgradeOperator("3.1.3", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
+  @ValueSource(strings = { "domain-in-image", "model-in-image" })
+  public void testOperatorWlsUpgradeFrom313ToDevelop(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom313ToDevelop with domain type {0}", domainType);
+    upgradeOperator(domainType, "3.1.3", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
   }
 
   /**
    * Operator upgrade from 3.1.4 to latest.
    */
-  @Test
+  @ParameterizedTest
   @DisplayName("Upgrade Operator from 3.1.4 to develop")
-  public void testOperatorWlsUpgradeFrom314ToDevelop() {
-    upgradeOperator("3.1.4", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
+  @ValueSource(strings = { "domain-in-image", "model-in-image" })
+  public void testOperatorWlsUpgradeFrom314ToDevelop(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom314ToDevelop with domain type {0}", domainType);
+    upgradeOperator(domainType, "3.1.4", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
   }
 
   /**
@@ -201,7 +215,8 @@ public void tearDown() {
   // Since Operator version 3.1.0 the service pod prefix has been changed 
   // from -external to -ext e.g.
   // domain1-adminserver-ext  NodePort    10.96.46.242   30001:30001/TCP 
-  private void upgradeOperator(String operatorVersion, String externalServiceNameSuffix, boolean useHelmUpgrade) {
+  private void upgradeOperator(String domainType, String operatorVersion, String externalServiceNameSuffix,
+                               boolean useHelmUpgrade) {
     logger.info("Assign a unique namespace for operator {0}", operatorVersion);
     assertNotNull(namespaces.get(0), "Namespace is null");
     final String opNamespace1 = namespaces.get(0);
@@ -230,14 +245,17 @@ private void upgradeOperator(String operatorVersion, String externalServiceNameS
     // install operator
     String opNamespace = opNamespace1;
     String opServiceAccount = opNamespace + "-sa";
-    installAndVerifyOperator(opNamespace, opServiceAccount, true,
-        0, opHelmParams, domainNamespace);
+    installAndVerifyOperator(opNamespace, opServiceAccount, true, 0, opHelmParams, domainNamespace);
 
     // create domain
-    createDomainHomeInImageAndVerify(
-        domainNamespace, operatorVersion, externalServiceNameSuffix);
+    if (domainType.equalsIgnoreCase("domain-in-image")) {
+      createDomainHomeInImageAndVerify(domainNamespace, operatorVersion, externalServiceNameSuffix);
+    } else {
+      createMiiDomainAndVerify(domainNamespace, domainUid, MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG,
+          adminServerPodName, managedServerPodNamePrefix, replicaCount);
+    }
+
     LinkedHashMap<String, OffsetDateTime> pods = new LinkedHashMap<>();
-    OffsetDateTime adminPodCreationTime = getPodCreationTime(domainNamespace, adminServerPodName);
     pods.put(adminServerPodName, getPodCreationTime(domainNamespace, adminServerPodName));
     // get the creation time of the managed server pods before patching
     for (int i = 1; i <= replicaCount; i++) {
@@ -258,7 +276,7 @@ private void upgradeOperator(String operatorVersion, String externalServiceNameS
 
       // start a new thread to collect the availability data of the application while the
       // main thread performs operator upgrade
-      List<Integer> appAvailability = new ArrayList<Integer>();
+      List<Integer> appAvailability = new ArrayList<>();
       logger.info("Start a thread to keep track of the application's availability");
       Thread accountingThread =
           new Thread(
@@ -330,6 +348,7 @@ private void upgradeOperator(String operatorVersion, String externalServiceNameS
       // install latest operator
       installAndVerifyOperator(opNamespace, opServiceAccount, true, 0, domainNamespace);
     }
+
     // check CRD version is updated
     logger.info("Checking CRD version ");
     withStandardRetryPolicy
diff --git a/integration-tests/src/test/resources/domain/miidomain-300.yaml b/integration-tests/src/test/resources/domain/miidomain-300.yaml
@@ -0,0 +1,118 @@
+# Copyright (c) 2021, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+# This is an example of how to define a Domain resource.
+#
+apiVersion: "weblogic.oracle/v8"
+kind: Domain
+metadata:
+  name: domain1
+  namespace: miidomain300-ns
+  labels:
+    weblogic.domainUID: domain1
+
+spec:
+  # Set to 'FromModel' to indicate 'Model in Image'.
+  domainHomeSourceType: FromModel
+
+  # The WebLogic Domain Home, this must be a location within
+  # the image for 'Model in Image' domains.
+  domainHome: /u01/domains/domain1
+
+  # The WebLogic Server image that the Operator uses to start the domain
+  image: "model-in-image:12.2.1.4"
+
+  # Defaults to "Always" if image tag (version) is ':latest'
+  imagePullPolicy: "IfNotPresent"
+
+  # Identify which Secret contains the credentials for pulling an image
+  imagePullSecrets:
+  - name: ocir-secret
+  
+  # Identify which Secret contains the WebLogic Admin credentials,
+  # the secret must contain 'username' and 'password' fields.
+  webLogicCredentialsSecret: 
+    name: weblogic-credentials
+
+  # Whether to include the WebLogic Server stdout in the pod's stdout, default is true
+  includeServerOutInPodLog: true
+  
+  # Set which WebLogic Servers the Operator will start
+  # - "NEVER" will not start any server in the domain
+  # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
+  # - "IF_NEEDED" will start all non-clustered servers, including the administration server, and clustered servers up to their replica count.
+  serverStartPolicy: "IF_NEEDED"
+
+  # Settings for all server pods in the domain including the introspector job pod
+  serverPod:
+    # Optional new or overridden environment variables for the domain's pods
+    # - This sample uses CUSTOM_DOMAIN_NAME in its image model file 
+    #   to set the Weblogic domain name
+    env:
+    - name: CUSTOM_DOMAIN_NAME
+      value: "domain1"
+    - name: JAVA_OPTIONS
+      value: "-Dweblogic.StdoutDebugEnabled=false"
+    - name: USER_MEM_ARGS
+      value: "-Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx512m "
+    resources:
+      requests:
+        cpu: "250m"
+        memory: "768Mi"
+
+  # The desired behavior for starting the domain's administration server.
+  adminServer:
+    # The serverStartState legal values are "RUNNING" or "ADMIN"
+    # "RUNNING" means the listed server will be started up to "RUNNING" mode
+    # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    serverStartState: "RUNNING"
+    # Setup a Kubernetes node port for the administration server default channel
+    adminService:
+      channels:
+      - channelName: default
+        nodePort: 0
+      - channelName: T3Channel
+   
+  # The number of managed servers to start for unlisted clusters
+  replicas: 1
+
+  # The desired behavior for starting a specific cluster's member servers
+  clusters:
+  - clusterName: cluster-1
+    serverStartState: "RUNNING"
+    serverPod:
+      # Instructs Kubernetes scheduler to prefer nodes for new cluster members where there are not
+      # already members of the same cluster.
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: "weblogic.clusterName"
+                      operator: In
+                      values:
+                        - $(CLUSTER_NAME)
+                topologyKey: "kubernetes.io/hostname"
+    # The number of managed servers to start for this cluster
+    replicas: 2
+
+  # Change the restartVersion to force the introspector job to rerun
+  # and apply any new model configuration, to also force a subsequent
+  # roll of your domain's WebLogic Server pods.
+  restartVersion: '1'
+
+  # Changes to this field cause the operator to repeat its introspection of the
+  #  WebLogic domain configuration.
+  introspectVersion: '1'
+
+  configuration:
+
+    # Settings for domainHomeSourceType 'FromModel'
+    model:
+      # Valid model domain types are 'WLS', 'JRF', and 'RestrictedJRF', default is 'WLS'
+      domainType: "WLS"
+
+      # All 'FromModel' domains require a runtimeEncryptionSecret with a 'password' field
+      runtimeEncryptionSecret: domain1-runtime-encryption-secret
