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

Author: rjeberhard

.github/workflows/publish-github-pages.yml

@@ -23,14 +23,14 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v2.6.0
+        uses: actions/checkout@v3
         with:
           ref: main
           fetch-depth: 32
           path: main
 
       - name: Checkout gh-pages
-        uses: actions/checkout@v2.6.0
+        uses: actions/checkout@v3
         with:
           ref: gh-pages
           path: gh-pages

Jenkinsfile.kindnightly

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 def kind_k8s_map = [
@@ -101,7 +101,8 @@ pipeline {
 
     tools {
         maven 'maven-3.8.5'
-        jdk 'jdk11'
+        jdk 'OpenJDK 17.0.2'
+        #jdk 'jdk11'
     }
 
     environment {

Jenkinsfile.oke

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 //
 

documentation/4.0/content/developerguide/documentation.md

@@ -22,17 +22,17 @@ update to the documentation, follow this process:
     ```
 
 3. Make your documentation updates by editing the source files in
-`documentation/staging/content`.
+`documentation/<release-version>/content`, for example `documentation/4.0/content`.
 {{% notice note %}}
-Make sure you check in the changes from the `documentation/staging/content` area _only_;
+Make sure you check in the changes from the `documentation/<release-version>/content` area _only_;
 do not build the site and check in the static files.
 {{% /notice %}}
 
 4. If you wish to view your changes, you can run the site locally using
 these commands. The site will be available on the URL shown here:
 
     ```shell
-    $ cd documentation/staging
+    $ cd documentation/<release-version>
     $ hugo server -b http://localhost:1313/weblogic-kubernetes-operator
     ```
 

documentation/4.0/content/release-notes.md

@@ -449,6 +449,6 @@ Updated several dependencies, including the Oracle Linux base for the container
 
 ### Known issues
 
-| Issue | Description |
-| --- | --- |
-| None currently |  |
+| Issue | Description                                                                                                                                                                                                                                         |
+| --- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Deadlock on WebLogic Managed Coherence Server startup with Oracle Coherence 12.2.1.3.20. | Intermittently, a deadlock may occur during deployment of the `CoherenceModule`, which prevents a WebLogic Managed Coherence Server from reaching `RUNNING` state.  This issue has been resolved in Oracle Coherence versions 12.2.1.4.0 and later. |

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -61,7 +61,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
-import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME_DEFAULT;
@@ -109,7 +108,6 @@
 import static oracle.weblogic.kubernetes.utils.K8sEvents.DOMAIN_ROLL_STARTING;
 import static oracle.weblogic.kubernetes.utils.K8sEvents.POD_CYCLE_STARTING;
 import static oracle.weblogic.kubernetes.utils.K8sEvents.checkEvent;
-import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.createIngressForDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
 import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResource;
@@ -174,11 +172,8 @@ class ItIntrospectVersion {
   private static String wlsPassword = ADMIN_PASSWORD_DEFAULT;
 
   private static String adminSvcExtHost = null;
-  private static String clusterRouteHost = null;
-  private static final String clusterServiceName = domainUid + "-cluster-" + cluster1Name;
 
   private Map<String, OffsetDateTime> cl2podsWithTimeStamps = null;
-  private Map<String, OffsetDateTime> cl1podsWithTimeStamps = null;
 
   private static final String INTROSPECT_DOMAIN_SCRIPT = "introspectDomain.sh";
   private static final Path samplePath = Paths.get(ITTESTS_DIR, "../kubernetes/samples");
@@ -329,21 +324,10 @@ void testDomainIntrospectVersionNotRolling() {
     podStateNotChanged(adminServerPodName, domainUid, introDomainNamespace, adminPodCreationTime);
     for (int i = 1; i <= cluster1ReplicaCount; i++) {
       podStateNotChanged(cluster1ManagedServerPodNamePrefix + i,
-          domainUid, introDomainNamespace, pods.get(i));
+          domainUid, introDomainNamespace, pods.get(cluster1ManagedServerPodNamePrefix + i));
     }
 
-    //create ingress controller - OKD uses services exposed as routes
-    if (!OKD) {
-      Map<String, Integer> clusterNameMsPortMap = new HashMap<>();
-      clusterNameMsPortMap.put(cluster1Name, managedServerPort);
-      logger.info("Creating ingress for domain {0} in namespace {1}", domainUid, introDomainNamespace);
-      createIngressForDomainAndVerify(domainUid, introDomainNamespace, clusterNameMsPortMap);
-    } else {
-      clusterRouteHost = createRouteForOKD(clusterServiceName, introDomainNamespace);
-    }
-
-    List<String> managedServerNames = new ArrayList<String>();
-    managedServerNames = new ArrayList<String>();
+    List<String> managedServerNames = new ArrayList<>();
     for (int i = 1; i <= cluster1ReplicaCount + 1; i++) {
       managedServerNames.add(cluster1ManagedServerNameBase + i);
     }
@@ -465,7 +449,7 @@ void testDomainIntrospectVersionRolling() {
         "Getting admin server port failed"),
         "Updated admin server port is not equal to expected value");
 
-    List<String> managedServerNames = new ArrayList<String>();
+    List<String> managedServerNames = new ArrayList<>();
     for (int i = 1; i <= cluster1ReplicaCount; i++) {
       managedServerNames.add(cluster1ManagedServerNameBase + i);
     }
@@ -586,7 +570,6 @@ void testCredentialChange() {
       checkPodReadyAndServiceExists(cluster1ManagedServerPodNamePrefix + i, domainUid, introDomainNamespace);
     }
 
-    DomainResource cr = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, introDomainNamespace));
     if (cluster2Created) {
       // verify new cluster managed server pods are ready
       for (int i = 1; i <= cluster2ReplicaCount; i++) {
@@ -601,11 +584,11 @@ void testCredentialChange() {
     final boolean VALID = true;
     logger.info("Check that after patching current credentials are not valid and new credentials are");
     verifyCredentials(adminSvcExtHost, adminServerPodName, introDomainNamespace,
-         ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, !VALID);
+         ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, false);
     verifyCredentials(adminSvcExtHost, adminServerPodName, introDomainNamespace,
          ADMIN_USERNAME_PATCH, ADMIN_PASSWORD_PATCH, VALID);
 
-    List<String> managedServerNames = new ArrayList<String>();
+    List<String> managedServerNames = new ArrayList<>();
     for (int i = 1; i <= cluster1ReplicaCount; i++) {
       managedServerNames.add(cluster1ManagedServerNameBase + i);
     }
@@ -688,7 +671,7 @@ void testCreateNewCluster() {
       checkPodReadyAndServiceExists(cluster2ManagedServerPodNamePrefix + i, domainUid, introDomainNamespace);
     }
 
-    List<String> managedServerNames = new ArrayList<String>();
+    List<String> managedServerNames = new ArrayList<>();
     for (int i = 1; i <= cluster2ReplicaCount; i++) {
       managedServerNames.add(cluster2ManagedServerNameBase + i);
     }
@@ -725,7 +708,7 @@ void testUpdateImageName() {
       cluster1ManagedServerNames.add(cluster1ManagedServerNameBase + i);
     }
     // get the map with server pods and their original creation timestamps
-    cl1podsWithTimeStamps = getPodsWithTimeStamps(introDomainNamespace, adminServerPodName,
+    Map<String, OffsetDateTime> cl1podsWithTimeStamps = getPodsWithTimeStamps(introDomainNamespace, adminServerPodName,
         cluster1ManagedServerPodNamePrefix, cluster1ReplicaCount);
 
     List<String> cluster2ManagedServerNames = new ArrayList<>();
@@ -753,8 +736,7 @@ void testUpdateImageName() {
     imageTag(imageName, imageUpdate);
     imageRepoLoginAndPushImageToRegistry(imageUpdate);
 
-    StringBuffer patchStr = null;
-    patchStr = new StringBuffer("[{");
+    StringBuffer patchStr = new StringBuffer("[{");
     patchStr.append("\"op\": \"replace\",")
         .append(" \"path\": \"/spec/image\",")
         .append("\"value\": \"")
@@ -1159,7 +1141,7 @@ private static void createDomain() {
         },
         logger,
         "Deploying the application using Rest");
-    List<String> managedServerNames = new ArrayList<String>();
+    List<String> managedServerNames = new ArrayList<>();
     for (int i = 1; i <= cluster1ReplicaCount; i++) {
       managedServerNames.add(cluster1ManagedServerNameBase + i);
     }
@@ -1282,7 +1264,6 @@ private void verifyIntrospectVersionLabelInPod() {
       verifyIntrospectVersionLabelValue(cluster1ManagedServerPodNamePrefix + i, introspectVersion);
     }
 
-    DomainResource cr = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, introDomainNamespace));
     if (cluster2Created) {
       // verify new cluster managed server pods are ready
       for (int i = 1; i <= cluster2ReplicaCount; i++) {
@@ -1299,16 +1280,23 @@ private void verifyIntrospectVersionLabelValue(String podName, String introspect
         getPod(introDomainNamespace, "", podName),
         "Get pod " + podName);
 
-    Map<String, String> myLabels = myPod.getMetadata().getLabels();
+    Map<String, String> myLabels = new HashMap<>();
+    if (myPod != null && myPod.getMetadata() != null) {
+      myLabels = myPod.getMetadata().getLabels();
+    }
 
-    for (Map.Entry<String, String> entry : myLabels.entrySet()) {
-      if (entry.getKey().equals(wlsIntroVersion)) {
-        logger.info("Get Spec Key:value = {0}:{1}", entry.getKey(), entry.getValue());
-        logger.info("Verifying weblogic.introspectVersion is set to {0}", introspectVersion);
+    if (myLabels != null) {
+      for (Map.Entry<String, String> entry : myLabels.entrySet()) {
+        if (entry.getKey().equals(wlsIntroVersion)) {
+          logger.info("Get Spec Key:value = {0}:{1}", entry.getKey(), entry.getValue());
+          logger.info("Verifying weblogic.introspectVersion is set to {0}", introspectVersion);
 
-        assertEquals(introspectVersion, entry.getValue(),
-            "Failed to set " + wlsIntroVersion + " to " + introspectVersion);
+          assertEquals(introspectVersion, entry.getValue(),
+              "Failed to set " + wlsIntroVersion + " to " + introspectVersion);
+        }
       }
+    } else {
+      logger.info("myLabels for pod {0} in namespace {1} is null", podName, introDomainNamespace);
     }
   }
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -342,7 +342,8 @@ void testDomainK8sEventsNonExistingCluster() {
   void testK8SEventsFailedLifeCycle() {
     V1Patch patch;
     String patchStr;
-    DomainResource domain = createDomain(domainNamespace5, domainUid, pvName5, pvcName5, "Never",
+    String domainUid5 = domainUid + "5";
+    DomainResource domain = createDomain(domainNamespace5, domainUid5, pvName5, pvcName5, "Never",
         spec -> spec.failureRetryLimitMinutes(2L));
     assertNotNull(domain, " Can't create domain resource");
 
@@ -352,12 +353,12 @@ void testK8SEventsFailedLifeCycle() {
 
     logger.info("Checking if the admin server {0} is shutdown in namespace {1}",
         adminServerPodName, domainNamespace5);
-    checkPodDoesNotExist(adminServerPodName, domainUid, domainNamespace5);
+    checkPodDoesNotExist(adminServerPodName, domainUid5, domainNamespace5);
 
     for (int i = 1; i <= replicaCount; i++) {
       logger.info("Checking if the managed server {0} is shutdown in namespace {1}",
           managedServerPodNamePrefix + i, domainNamespace5);
-      checkPodDoesNotExist(managedServerPodNamePrefix + i, domainUid, domainNamespace5);
+      checkPodDoesNotExist(managedServerPodNamePrefix + i, domainUid5, domainNamespace5);
     }
 
     logger.info("Replace the domainHome to a nonexisting location to verify the following events"
@@ -368,15 +369,15 @@ void testK8SEventsFailedLifeCycle() {
     logger.info("PatchStr for domainHome: {0}", patchStr);
 
     patch = new V1Patch(patchStr);
-    assertTrue(patchDomainCustomResource(domainUid, domainNamespace5, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
+    assertTrue(patchDomainCustomResource(domainUid5, domainNamespace5, patch, V1Patch.PATCH_FORMAT_JSON_PATCH),
         "patchDomainCustomResource failed");
 
     logger.info("verify domain changed event is logged");
-    checkEvent(opNamespace, domainNamespace5, domainUid, DOMAIN_CHANGED, "Normal", timestamp);
+    checkEvent(opNamespace, domainNamespace5, domainUid5, DOMAIN_CHANGED, "Normal", timestamp);
     logger.info("verify domain failed event");
-    checkFailedEvent(opNamespace, domainNamespace5, domainUid, ABORTED_ERROR, "Warning", timestamp);
+    checkFailedEvent(opNamespace, domainNamespace5, domainUid5, ABORTED_ERROR, "Warning", timestamp);
 
-    shutdownDomain(domainUid, domainNamespace5);
+    shutdownDomain(domainUid5, domainNamespace5);
   }
 
   /**
@@ -390,6 +391,8 @@ void testK8SEventsFailedLifeCycle() {
   void testK8SEventsMultiClusterEvents() {
     OffsetDateTime timestamp = now();
     createNewCluster();
+    OffsetDateTime timestamp2 = now();
+    logger.info("Scale the newly-added cluster");
     scaleClusterWithRestApi(domainUid, cluster2Name, 1,
             externalRestHttpsPort, opNamespace, opServiceAccount);
     logger.info("verify the Domain_Available event is generated");
@@ -403,13 +406,13 @@ void testK8SEventsMultiClusterEvents() {
             domainUid, DOMAIN_COMPLETED, "Normal", timestamp);
     logger.info("verify the ClusterCompleted event is generated");
     checkEvent(opNamespace, domainNamespace3,
-        domainUid, CLUSTER_COMPLETED, "Normal", timestamp);
+        domainUid, CLUSTER_COMPLETED, "Normal", timestamp2);
     logger.info("verify the only 1 Completed event for domain is generated");
     assertEquals(1, getOpGeneratedEventCount(domainNamespace3, domainUid,
             DOMAIN_COMPLETED, timestamp));
     logger.info("verify the only 1 ClusterCompleted event for domain is generated");
     assertEquals(1, getOpGeneratedEventCount(domainNamespace3, domainUid,
-        CLUSTER_COMPLETED, timestamp));
+        CLUSTER_COMPLETED, timestamp2));
   }
 
   /**