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

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.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;
@@ -64,7 +64,6 @@
 @Tag("oke-sequential")
 @Tag("okd-wls-mrg")
 @IntegrationTest
-@Tag("olcne")
 class ItDedicatedMode {
   // namespace constants
   private static String opNamespace = null;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItRecoveryDomainInPV.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;
@@ -132,7 +132,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
    * Make sure all 100 persistent messages are recovered form managed server(2)
    */
   @Test
-  @DisplayName("verifies persistent WebLogic data survies the server pod")
+  @DisplayName("verifies persistent WebLogic data survives the server pod scaling")
   void testRecoveryDomainHomeInPv() {
 
     final String managedServerNameBase = "managed-";

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

@@ -695,7 +695,7 @@ private void restoreDomainImageAndReplicas(String domainUid, String domainNamesp
 
     // check only managed server1 pod exists, all other managed server pods are deleted
     String managedServerPrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
-    for (int i = DEFAULT_MAX_CLUSTER_SIZE + 1; i > 1; i--) {
+    for (int i = DEFAULT_MAX_CLUSTER_SIZE; i > 1; i--) {
       checkPodDeleted(managedServerPrefix + i, domainUid, domainNamespace);
     }
     checkPodReadyAndServiceExists(managedServerPrefix + "1", domainUid, domainNamespace);

kubernetes/samples/scripts/common/utility.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -855,7 +855,7 @@ checkPodDelete() {
 checkPodState() {
 
  status="NotReady"
- max=60
+ max=120
  count=1
 
  pod=$1
@@ -880,7 +880,7 @@ checkPodState() {
   count=`expr $count + 1`
  done
  if [ $count -gt $max ] ; then
-   echo "[ERROR] Unable to start the Pod [$pod] after 300s "; 
+   echo "[ERROR] Unable to start the Pod [$pod] after 600s ";
    exit 1
  fi 
 

operator/src/main/java/oracle/kubernetes/operator/DomainProcessor.java

@@ -18,6 +18,7 @@
 import oracle.kubernetes.operator.helpers.ClusterPresenceInfo;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.EventHelper.EventItem;
+import oracle.kubernetes.operator.work.FiberGate;
 import oracle.kubernetes.weblogic.domain.model.ClusterResource;
 import oracle.kubernetes.weblogic.domain.model.DomainResource;
 
@@ -131,4 +132,8 @@ default Map<String, Map<String,DomainPresenceInfo>>  getDomainPresenceInfoMap()
   default Map<String, Map<String, ClusterPresenceInfo>>  getClusterPresenceInfoMap() {
     return new ConcurrentHashMap<>();
   }
+
+  Map<String, FiberGate> getMakeRightFiberGateMap();
+
+  DomainPresenceInfo getExistingDomainPresenceInfo(String namespace, String domainUid);
 }

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -106,7 +106,7 @@ public class DomainProcessorImpl implements DomainProcessor, MakeRightExecutor {
   private static Map<String, Map<String, ScheduledFuture<?>>> statusUpdaters = new ConcurrentHashMap<>();
 
   // List of clusters in a namespace.
-  private static Map<String, Map<String, ClusterPresenceInfo>> clusters = new ConcurrentHashMap<>();
+  private static final Map<String, Map<String, ClusterPresenceInfo>> clusters = new ConcurrentHashMap<>();
 
   private final DomainProcessorDelegate delegate;
   private final SemanticVersion productVersion;
@@ -132,11 +132,12 @@ public DomainProcessorImpl(DomainProcessorDelegate delegate, SemanticVersion pro
     this.productVersion = productVersion;
   }
 
-  private static DomainPresenceInfo getExistingDomainPresenceInfo(String ns, String domainUid) {
+  @Override
+  public DomainPresenceInfo getExistingDomainPresenceInfo(String ns, String domainUid) {
     return domains.computeIfAbsent(ns, k -> new ConcurrentHashMap<>()).get(domainUid);
   }
 
-  private static DomainPresenceInfo getExistingDomainPresenceInfo(DomainPresenceInfo newPresence) {
+  private DomainPresenceInfo getExistingDomainPresenceInfo(DomainPresenceInfo newPresence) {
     return getExistingDomainPresenceInfo(newPresence.getNamespace(), newPresence.getDomainUid());
   }
 
@@ -158,6 +159,11 @@ public Map<String, Map<String,ClusterPresenceInfo>>  getClusterPresenceInfoMap()
     return clusters;
   }
 
+  @Override
+  public Map<String, FiberGate> getMakeRightFiberGateMap() {
+    return makeRightFiberGates;
+  }
+
   private static List<DomainPresenceInfo> getExistingDomainPresenceInfoForCluster(String ns, String cluster) {
     List<DomainPresenceInfo> referencingDomains = new ArrayList<>();
     Optional.ofNullable(domains.get(ns)).ifPresent(d -> d.values().stream()
@@ -244,21 +250,10 @@ private static void deleteEventK8SObjects(CoreV1Event event) {
     getEventK8SObjects(event).remove(event);
   }
 
-  private static void onCreateModifyEvent(CoreV1Event event) {
-    V1ObjectReference ref = event.getInvolvedObject();
-
-    if (ref == null || ref.getName() == null) {
-      return;
-    }
-
-    String kind = ref.getKind();
-    if (kind == null) {
-      return;
-    }
-
+  private static void onCreateModifyEvent(@Nonnull String kind, @Nonnull String name, CoreV1Event event) {
     switch (kind) {
       case EventConstants.EVENT_KIND_POD:
-        processPodEvent(event);
+        processPodEvent(name, event);
         break;
       case EventConstants.EVENT_KIND_DOMAIN:
       case EventConstants.EVENT_KIND_NAMESPACE:
@@ -272,13 +267,8 @@ private static void onCreateModifyEvent(CoreV1Event event) {
     }
   }
 
-  private static void processPodEvent(CoreV1Event event) {
-    V1ObjectReference ref = event.getInvolvedObject();
-
-    if (ref == null || ref.getName() == null) {
-      return;
-    }
-    if (ref.getName().equals(NamespaceHelper.getOperatorPodName())) {
+  private static void processPodEvent(@Nonnull String name, CoreV1Event event) {
+    if (name.equals(NamespaceHelper.getOperatorPodName())) {
       updateEventK8SObjects(event);
     } else {
       processServerEvent(event);
@@ -313,30 +303,19 @@ public static List<DomainResource> getDomains(String ns) {
   }
 
   private static void addToList(List<DomainResource> list, DomainPresenceInfo info) {
-    if (info.isNotDeleting()) {
+    if (isNotDeleting(info)) {
       list.add(info.getDomain());
     }
   }
 
-  private void onDeleteEvent(CoreV1Event event) {
-    V1ObjectReference ref = event.getInvolvedObject();
-
-    if (ref == null || ref.getName() == null) {
-      return;
-    }
-
-    String kind = ref.getKind();
-    if (kind == null) {
-      return;
-    }
-
+  private void onDeleteEvent(@Nonnull String kind, @Nonnull String name, CoreV1Event event) {
     switch (kind) {
       case EventConstants.EVENT_KIND_DOMAIN:
       case EventConstants.EVENT_KIND_NAMESPACE:
         deleteEventK8SObjects(event);
         break;
       case EventConstants.EVENT_KIND_POD:
-        if (ref.getName().equals(NamespaceHelper.getOperatorPodName())) {
+        if (name.equals(NamespaceHelper.getOperatorPodName())) {
           deleteEventK8SObjects(event);
         }
         break;
@@ -432,7 +411,11 @@ private boolean findClusterPresenceInfo(String namespace, String clusterName) {
   }
 
   private boolean hasDeletedClusterEventData(MakeRightClusterOperation operation) {
-    return operation.getEventData() != null && operation.getEventData().getItem().name().equals("CLUSTER_DELETED");
+    return EventItem.CLUSTER_DELETED == getEventItem(operation);
+  }
+
+  private EventItem getEventItem(MakeRightClusterOperation operation) {
+    return Optional.ofNullable(operation.getEventData()).map(EventData::getItem).orElse(null);
   }
 
   private void logStartingDomain(DomainPresenceInfo presenceInfo) {
@@ -477,6 +460,10 @@ public void registerClusterPresenceInfo(ClusterPresenceInfo info) {
   @Override
   public void unregisterDomainPresenceInfo(DomainPresenceInfo info) {
     unregisterPresenceInfo(info.getNamespace(), info.getDomainUid());
+  }
+
+  @Override
+  public void unregisterDomainEventK8SObjects(DomainPresenceInfo info) {
     unregisterEventK8SObject(info.getNamespace(), info.getDomainUid());
   }
 
@@ -595,7 +582,7 @@ private void processServerPodWatch(V1Pod pod, String watchType) {
         break;
       case DELETED:
         boolean removed = info.deleteServerPodFromEvent(serverName, pod);
-        if (removed && info.isNotDeleting() && Boolean.FALSE.equals(info.isServerPodBeingDeleted(serverName))) {
+        if (removed && isNotDeleting(info) && Boolean.FALSE.equals(info.isServerPodBeingDeleted(serverName))) {
           LOGGER.info(MessageKeys.POD_DELETED, domainUid, getPodNamespace(pod), serverName);
           createMakeRightOperation(info).interrupt().withExplicitRecheck().execute();
         }
@@ -670,7 +657,7 @@ public void dispatchServiceWatch(Watch.Response<V1Service> item) {
         break;
       case DELETED:
         boolean removed = ServiceHelper.deleteFromEvent(info, item.object);
-        if (removed && info.isNotDeleting()) {
+        if (removed && isNotDeleting(info)) {
           createMakeRightOperation(info).interrupt().withExplicitRecheck().execute();
         }
         break;
@@ -702,14 +689,18 @@ public void dispatchPodDisruptionBudgetWatch(Watch.Response<V1PodDisruptionBudge
         break;
       case DELETED:
         boolean removed = PodDisruptionBudgetHelper.deleteFromEvent(info, item.object);
-        if (removed && info.isNotDeleting()) {
+        if (removed && isNotDeleting(info)) {
           createMakeRightOperation(info).interrupt().withExplicitRecheck().execute();
         }
         break;
       default:
     }
   }
 
+  private static boolean isNotDeleting(DomainPresenceInfo info) {
+    return info.isNotDeleting() && info.getDomain() != null;
+  }
+
   private String getPDBNamespace(V1PodDisruptionBudget pdb) {
     return Optional.ofNullable(pdb).map(V1PodDisruptionBudget::getMetadata)
         .map(V1ObjectMeta::getNamespace).orElse(null);
@@ -721,7 +712,7 @@ private String getPDBNamespace(V1PodDisruptionBudget pdb) {
    */
   public void dispatchConfigMapWatch(Watch.Response<V1ConfigMap> item) {
     V1ConfigMap c = item.object;
-    if (c != null && c.getMetadata() != null) {
+    if (c.getMetadata() != null) {
       switch (item.type) {
         case MODIFIED:
         case DELETED:
@@ -742,18 +733,22 @@ public void dispatchConfigMapWatch(Watch.Response<V1ConfigMap> item) {
    */
   public void dispatchEventWatch(Watch.Response<CoreV1Event> item) {
     CoreV1Event e = item.object;
-    if (e != null) {
-      switch (item.type) {
-        case ADDED:
-        case MODIFIED:
-          onCreateModifyEvent(e);
-          break;
-        case DELETED:
-          onDeleteEvent(e);
-          break;
-        case ERROR:
-        default:
-      }
+    V1ObjectReference ref = e.getInvolvedObject();
+
+    if (ref == null || ref.getName() == null || ref.getKind() == null) {
+      return;
+    }
+
+    switch (item.type) {
+      case ADDED:
+      case MODIFIED:
+        onCreateModifyEvent(ref.getKind(), ref.getName(), e);
+        break;
+      case DELETED:
+        onDeleteEvent(ref.getKind(), ref.getName(), e);
+        break;
+      case ERROR:
+      default:
     }
   }
 

operator/src/main/java/oracle/kubernetes/operator/DomainResourcesValidation.java

@@ -116,7 +116,7 @@ private boolean isForDomain(ClusterResource clusterResource, DomainPresenceInfo
   }
 
   private void addPodList(V1PodList list) {
-    getDomainPresenceInfoMap().values().stream().forEach(dpi -> removeDeletedPodsFromDPI(list, dpi));
+    getDomainPresenceInfoMap().values().forEach(dpi -> removeDeletedPodsFromDPI(list, dpi));
     list.getItems().forEach(this::addPod);
   }
 
@@ -140,14 +140,22 @@ private void addPod(V1Pod pod) {
     String domainUid = PodHelper.getPodDomainUid(pod);
     String serverName = PodHelper.getPodServerName(pod);
     if (domainUid != null && serverName != null) {
-      getDomainPresenceInfo(domainUid).setServerPodFromEvent(serverName, pod);
+      setServerPodFromEvent(getExistingDomainPresenceInfo(domainUid), serverName, pod);
     }
   }
 
-  private DomainPresenceInfo getDomainPresenceInfo(String domainUid) {
+  private void setServerPodFromEvent(DomainPresenceInfo info, String serverName, V1Pod pod) {
+    Optional.ofNullable(info).ifPresent(i -> i.setServerPodFromEvent(serverName, pod));
+  }
+
+  private DomainPresenceInfo getOrComputeDomainPresenceInfo(String domainUid) {
     return getDomainPresenceInfoMap().computeIfAbsent(domainUid, k -> new DomainPresenceInfo(namespace, domainUid));
   }
 
+  private DomainPresenceInfo getExistingDomainPresenceInfo(String domainUid) {
+    return getDomainPresenceInfoMap().get(domainUid);
+  }
+
   private Map<String, DomainPresenceInfo> getDomainPresenceInfoMap() {
     return processor.getDomainPresenceInfoMap().computeIfAbsent(namespace, k -> new ConcurrentHashMap<>());
   }
@@ -163,7 +171,7 @@ private void addServiceList(V1ServiceList list) {
   private void addService(V1Service service) {
     String domainUid = ServiceHelper.getServiceDomainUid(service);
     if (domainUid != null) {
-      ServiceHelper.addToPresence(getDomainPresenceInfo(domainUid), service);
+      ServiceHelper.addToPresence(getExistingDomainPresenceInfo(domainUid), service);
     }
   }
 
@@ -174,12 +182,12 @@ private void addPodDisruptionBudgetList(V1PodDisruptionBudgetList list) {
   private void addPodDisruptionBudget(V1PodDisruptionBudget pdb) {
     String domainUid = PodDisruptionBudgetHelper.getDomainUid(pdb);
     if (domainUid != null) {
-      PodDisruptionBudgetHelper.addToPresence(getDomainPresenceInfo(domainUid), pdb);
+      PodDisruptionBudgetHelper.addToPresence(getExistingDomainPresenceInfo(domainUid), pdb);
     }
   }
 
   private void addDomainList(DomainList list) {
-    getDomainPresenceInfoMap().values().stream().forEach(dpi -> updateDeletedDomainsinDPI(list));
+    getDomainPresenceInfoMap().values().forEach(dpi -> updateDeletedDomainsinDPI(list));
     list.getItems().forEach(this::addDomain);
   }
 
@@ -188,16 +196,27 @@ private void updateDeletedDomainsinDPI(DomainList list) {
         .map(DomainResource::getDomainUid).collect(Collectors.toList());
 
     getDomainPresenceInfoMap().values().stream()
-        .filter(dpi -> !domainNamesFromList.contains(dpi.getDomainUid())).collect(Collectors.toList())
-        .forEach(i -> getDomainPresenceInfo(i.getDomainUid()).setDomain(null));
+        .filter(dpi -> !domainNamesFromList.contains(dpi.getDomainUid()))
+        .filter(dpi -> isNotBeingProcessed(dpi.getNamespace(), dpi.getDomainUid()))
+        .collect(Collectors.toList())
+        .forEach(i -> i.setDomain(null));
+  }
+
+  private boolean isNotBeingProcessed(String namespace, String domainUid) {
+    return processor.getMakeRightFiberGateMap().get(namespace).getCurrentFibers().get(domainUid) == null;
   }
 
   private void addDomain(DomainResource domain) {
-    getDomainPresenceInfo(domain.getDomainUid()).setDomain(domain);
+    getOrComputeDomainPresenceInfo(domain.getDomainUid()).setDomain(domain);
   }
 
   private void addClusterList(ClusterList list) {
     activeClusterResources = list;
+    list.getItems().forEach(this::addCluster);
+  }
+
+  private void addCluster(ClusterResource cluster) {
+    getClusterPresenceInfoMap().put(cluster.getClusterName(), new ClusterPresenceInfo(cluster.getNamespace(), cluster));
   }
 
   private Stream<DomainPresenceInfo> getStrandedDomainPresenceInfos(DomainProcessor dp) {
@@ -229,7 +248,7 @@ private static void activateDomain(DomainProcessor dp, DomainPresenceInfo info)
     info.setPopulated(true);
     MakeRightDomainOperation makeRight = dp.createMakeRightOperation(info).withExplicitRecheck();
     if (info.getDomain().getStatus() == null) {
-      makeRight = makeRight.withEventData(new EventData(DOMAIN_CREATED)).interrupt();
+      makeRight.withEventData(new EventData(DOMAIN_CREATED)).interrupt();
     }
     makeRight.execute();
   }