Merge branch 'backport-main-sankar' into 'release/4.0'

backporting changes from main branch MRs 4214,4213, and 4208

See merge request weblogic-cloud/weblogic-kubernetes-operator!4235

Author: rjeberhard

integration-tests/src/test/java/oracle/verrazzano/weblogic/Workload.java

@@ -3,6 +3,9 @@
 
 package oracle.verrazzano.weblogic;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.swagger.annotations.ApiModel;
@@ -25,6 +28,9 @@ public class Workload implements KubernetesObject {
   @ApiModelProperty("The Workload meta-data. Must include the name and namespace.")
   private V1ObjectMeta metadata = new V1ObjectMeta();
 
+  @ApiModelProperty("Configmap data of the Workload.")
+  Map<String, String> data = new HashMap<>();
+  
   @ApiModelProperty("The specification of the Workload. Required.")
   private WorkloadSpec spec = new WorkloadSpec();
 
@@ -94,7 +100,24 @@ public WorkloadSpec getSpec() {
 
   public void setSpec(WorkloadSpec spec) {
     this.spec = spec;
-  }  
+  }
+  
+  public Workload data(Map<String, String> data) {
+    this.data = data;
+    return this;
+  }
+
+  public Map<String, String> data() {
+    return data;
+  }
+
+  public Map<String, String> getData() {
+    return data;
+  }
+
+  public void setData(Map<String, String> data) {
+    this.data = data;
+  }
 
   @Override
   public String toString() {
@@ -103,6 +126,7 @@ public String toString() {
         .append("kind", kind)
         .append("metadata", metadata)
         .append("spec", spec)
+        .append("data", data)    
         .toString();
   }
 
@@ -113,6 +137,7 @@ public int hashCode() {
         .append(apiVersion)
         .append(kind)
         .append(spec)
+        .append(data)
         .toHashCode();
   }
 
@@ -131,6 +156,7 @@ public boolean equals(Object other) {
         .append(apiVersion, rhs.apiVersion)
         .append(kind, rhs.kind)
         .append(spec, rhs.spec)
+        .append(data, rhs.data)
         .isEquals();
   }
 

integration-tests/src/test/java/oracle/verrazzano/weblogic/kubernetes/ItVzDBOperator.java

@@ -97,6 +97,7 @@ public interface TestConstants {
   public static final String FMWINFRA_IMAGE_NAME_DEFAULT = "test-images/fmw-infrastructure";
   public static final String FMWINFRA_IMAGE_TAG_DEFAULT = "12.2.1.4";
   public static final String DB_IMAGE_NAME_DEFAULT = "test-images/database/enterprise";
+  public static final String DB_PREBUILT_IMAGE_NAME_DEFAULT = "test-images/database/express";
   public static final String DB_IMAGE_TAG_DEFAULT = "12.2.0.1-slim";
 
   // repository to push the domain images created during test execution
@@ -128,7 +129,10 @@ public interface TestConstants {
   // if base images repo is OCIR use OCIR default image values
   public static final String DB_IMAGE_NAME = BASE_IMAGES_PREFIX
       + getNonEmptySystemProperty("wko.it.db.image.name", DB_IMAGE_NAME_DEFAULT);
+  public static final String DB_PREBUILT_IMAGE_NAME = BASE_IMAGES_PREFIX
+      + getNonEmptySystemProperty("wko.it.db.prebuilt.image.name", DB_PREBUILT_IMAGE_NAME_DEFAULT);
   public static final String DB_IMAGE_TAG = getNonEmptySystemProperty("wko.it.db.image.tag", DB_IMAGE_TAG_DEFAULT);
+  public static final String DB_IMAGE_PREBUILT_TAG = getNonEmptySystemProperty("wko.it.db.image.tag", "18.4.0-xe");
 
   // WebLogic Base Image with Japanese Locale
   public static final String LOCALE_IMAGE_NAME = TEST_IMAGES_REPO + "/" + TEST_IMAGES_TENANCY + "/test-images/weblogic";
@@ -347,7 +351,9 @@ public interface TestConstants {
       getNonEmptySystemProperty("wko.it.istio.version", "1.13.2");
 
   //MySQL database constants
-  public static final String MYSQL_VERSION = "5.6";
+  public static final String MYSQL_IMAGE = BASE_IMAGES_PREFIX
+      + "/test-images/database/mysql";
+  public static final String MYSQL_VERSION = "8.0.29";
 
   //OKE constants
   public static final boolean OKE_CLUSTER =
@@ -405,10 +411,10 @@ public interface TestConstants {
   public static final String ORACLE_DB_SECRET_NAME = "oracle-db-secret";
 
   // Oracle database operator constants
-  public static final String ORACLE_DB_OPERATOR_RELEASE_LATEST = "release/0.2.0";
+  public static final String ORACLE_DB_OPERATOR_RELEASE_LATEST = "release/0.2.1";
   public static final String ORACLE_DB_OPERATOR_RELEASE =
       getNonEmptySystemProperty("wko.it.oracle.db.operator.release", ORACLE_DB_OPERATOR_RELEASE_LATEST);
-  public static final String DB_OPERATOR_IMAGE = BASE_IMAGES_PREFIX + "test-images/database/operator:0.2.0";
+  public static final String DB_OPERATOR_IMAGE = BASE_IMAGES_PREFIX + "test-images/database/operator:0.2.1";
   public static final String CERT_MANAGER
       = "https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml";
   public static final String DB_OPERATOR_YAML_URL = "https://raw.githubusercontent.com/"

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

@@ -1369,6 +1369,32 @@ public static boolean createComponent(Component component, String... comVersion)
     return true;
   }
 
+  /**
+   * Delete Component Custom Resources from a given namespace.
+   *
+   * @param name of the component to delete
+   * @param namespace namespace name
+   * @return true if the resource exists and deleted
+   * @throws io.kubernetes.client.openapi.ApiException when list fails
+   */
+  public static boolean deleteComponent(String name, String namespace)
+      throws ApiException {
+    KubernetesApiResponse<Component> response = null;
+    try {
+      response = vzComCrdClient.delete(namespace, name);
+    } catch (Exception ex) {
+      getLogger().warning(ex.getMessage());
+      throw ex;
+    }
+
+    if (!response.isSuccess()) {
+      getLogger().warning("Failed to delete config map '" + name + "' from namespace: "
+          + namespace + " with HTTP status code: " + response.getHttpStatusCode());
+      return false;
+    }
+    return response.isSuccess();
+  }
+  
   /**
    * List Component Custom Resources from a given namespace.
    *

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java

@@ -811,7 +811,8 @@ public static void runJavacInsidePod(String podName, String namespace, String de
     StringBuffer javacCmd = new StringBuffer(KUBERNETES_CLI + " exec -n ");
     javacCmd.append(namespace);
     javacCmd.append(" -it ");
-    javacCmd.append(podName);
+    javacCmd.append(" -c weblogic-server ");
+    javacCmd.append(podName);    
     javacCmd.append(" -- /bin/bash -c \"");
     javacCmd.append("javac -cp ");
     javacCmd.append(jarLocation);
@@ -844,6 +845,7 @@ public static Callable<Boolean> runClientInsidePod(String podName, String namesp
     StringBuffer javapCmd = new StringBuffer(KUBERNETES_CLI + " exec -n ");
     javapCmd.append(namespace);
     javapCmd.append(" -it ");
+    javapCmd.append(" -c weblogic-server ");
     javapCmd.append(podName);
     javapCmd.append(" -- /bin/bash -c \"");
     javapCmd.append("java -cp ");

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java

@@ -269,7 +269,7 @@ public static void editConfigMap(String oldRegex, String newRegex,
   /**
    * Read the content of a model file as a String and add it to a map.
    */
-  private static void addModelFile(Map<String, String> data, String modelFile) {
+  public static void addModelFile(Map<String, String> data, String modelFile) {
     LoggingFacade logger = getLogger();
     logger.info("Add model file {0}", modelFile);