Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

integration-tests/pom.xml

@@ -50,6 +50,7 @@
         <wko.it.node.ip>${env.NODE_IP}</wko.it.node.ip>
         <wko.it.fss.dir>${env.FSS_DIR}</wko.it.fss.dir>
         <wko.it.okd.cluster>${env.OKD}</wko.it.okd.cluster>
+        <wko.it.ocne.cluster>${env.OCNE}</wko.it.ocne.cluster>
         <wko.it.oracle.db.operator.release>${env.ORACLE_DB_OPERATOR_RELEASE}</wko.it.oracle.db.operator.release>
         <wko.it.oraclelinux.test.version>${env.ORACLELINUX_TEST_VERSION}</wko.it.oraclelinux.test.version>
         <wko.it.wdt.download.url>${wdt.download.url}</wko.it.wdt.download.url>
@@ -228,6 +229,7 @@
                                 <wko.it.nfs.server>${wko.it.nfs.server}</wko.it.nfs.server>
                                 <wko.it.fss.dir>${wko.it.fss.dir}</wko.it.fss.dir>
                                 <wko.it.okd.cluster>${wko.it.okd.cluster}</wko.it.okd.cluster>
+                                <wko.it.ocne.cluster>${wko.it.ocne.cluster}</wko.it.ocne.cluster>
                                 <wko.it.oracle.db.operator.release>${wko.it.oracle.db.operator.release}</wko.it.oracle.db.operator.release>
                                 <wko.it.oraclelinux.test.version>${wko.it.oraclelinux.test.version}</wko.it.oraclelinux.test.version>
                                 <wko.it.wdt.download.url>${wko.it.wdt.download.url}</wko.it.wdt.download.url>

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

@@ -348,6 +348,10 @@ public interface TestConstants {
   public static final boolean OKD =
       Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.okd.cluster", "false"));
 
+  // OCNE constants
+  public static final boolean OCNE =
+      Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.ocne.cluster", "false"));
+
   // default name suffixes
   public String DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX = "-ext";
   public String DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX = "-introspector";

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

@@ -57,6 +57,7 @@
 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.MII_BASIC_WDT_MODEL_FILE;
+import static oracle.weblogic.kubernetes.TestConstants.OCNE;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
@@ -292,7 +293,7 @@ public void beforeAll(ExtensionContext context) {
 
         // set initialization success to true, not counting the istio installation as not all tests use istio
         isInitializationSuccessful = true;
-        if (!OKD) {
+        if ((!OKD && !OCNE) || (OCNE && !assertDoesNotThrow(() -> Namespace.exists("istio-system")))) {
           logger.info("Installing istio before any test suites are run");
           installIstio();
         }
@@ -336,11 +337,11 @@ public void close() {
     if (SKIP_CLEANUP) {
       logger.info("Skipping RESULTS_ROOT clean up after test execution");
     } else {
-      if (!OKD) {
+      if (!OKD && !OCNE) {
         logger.info("Uninstall istio after all test suites are run");
         uninstallIstio();
       }
-      if (!OKD && !OKE_CLUSTER) {
+      if (!OKD && !OKE_CLUSTER && !OCNE) {
         logger.info("Delete istio-system namespace after all test suites are run");
         deleteNamespace("istio-system");
       }
@@ -618,5 +619,4 @@ private OperatorParams installWebHookOnlyOperator() {
         "null" // domainNamespace
     );
   }
-
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java

@@ -3,12 +3,12 @@
 
 package oracle.weblogic.kubernetes.utils;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1Namespace;
-import io.kubernetes.client.util.Yaml;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 
@@ -30,21 +30,21 @@ public class VerrazzanoUtils {
   /**
    * set labels to domain namespace for the WKO to manage it through namespace label selection strategy.
    *
-   * @param domainNS domain namespace to label
+   * @param namespaces list of domain namespace to label
    * @throws ApiException throws exception when label cannot be set
    */
-  public static void setLabelToNamespace(String domainNS) throws ApiException {
+  public static void setLabelToNamespace(List<String> namespaces) throws ApiException {
     //add label to domain namespace
     assertDoesNotThrow(() -> TimeUnit.MINUTES.sleep(1));
     Map<String, String> labels = new java.util.HashMap<>();
     labels.put("verrazzano-managed", "true");
     labels.put("istio-injection", "enabled");
-    V1Namespace namespaceObject = assertDoesNotThrow(() -> Kubernetes.getNamespace(domainNS));
-    logger.info(Yaml.dump(namespaceObject));
-    assertNotNull(namespaceObject, "Can't find namespace with name " + domainNS);
-    namespaceObject.getMetadata().setLabels(labels);
-    assertDoesNotThrow(() -> replaceNamespace(namespaceObject));
-    logger.info(Yaml.dump(Kubernetes.getNamespace(domainNS)));
+    for (String namespace : namespaces) {
+      V1Namespace namespaceObject = assertDoesNotThrow(() -> Kubernetes.getNamespace(namespace));
+      assertNotNull(namespaceObject, "Can't find namespace with name " + namespace);
+      namespaceObject.getMetadata().setLabels(labels);
+      assertDoesNotThrow(() -> replaceNamespace(namespaceObject));
+    }
   }
 
   /**

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

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.9.0</version>
+            <version>3.9.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

operator-build-maven-plugin/pom.xml

@@ -632,13 +632,13 @@
     <maven-site-plugin-version>3.12.1</maven-site-plugin-version>
     <maven-surefire-plugin-version>3.0.0</maven-surefire-plugin-version>
     <maven-checkstyle-plugin-version>3.2.1</maven-checkstyle-plugin-version>
-    <maven-release-plugin-version>3.0.0-M7</maven-release-plugin-version>
+    <maven-release-plugin-version>3.0.0</maven-release-plugin-version>
     <maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
     <maven-failsafe-plugin-version>3.0.0</maven-failsafe-plugin-version>
     <maven-dependency-plugin-version>3.5.0</maven-dependency-plugin-version>
     <maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
     <exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
-    <checkstyle-version>10.9.1</checkstyle-version>
+    <checkstyle-version>10.9.2</checkstyle-version>
     <directory-maven-version>1.0</directory-maven-version>
     <maven-jxr-plugin-version>3.3.0</maven-jxr-plugin-version>
     <maven-gpg-plugin-version>3.0.1</maven-gpg-plugin-version>