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

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/DomainNamespaces.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.kubernetes.operator;
@@ -75,6 +75,10 @@ AtomicBoolean isStopping(String ns) {
     return namespaceStoppingMap.computeIfAbsent(ns, key -> new AtomicBoolean(false));
   }
 
+  AtomicBoolean getStopping(String ns) {
+    return namespaceStoppingMap.get(ns);
+  }
+
   boolean isStarting(String ns) {
     return Optional.ofNullable(namespaceStatuses.get(ns))
           .map(NamespaceStatus::isNamespaceStarting)

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

@@ -1,8 +1,9 @@
-// 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.kubernetes.operator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -271,7 +272,7 @@ static class NamespaceListAfterStep extends Step {
 
     @Override
     public NextAction apply(Packet packet) {
-      NamespaceValidationContext validationContext = new NamespaceValidationContext(packet);
+      NamespaceValidationContext validationContext = new NamespaceValidationContext(packet, domainNamespaces);
       getNonNullConfiguredDomainNamespaces().forEach(validationContext::validateConfiguredNamespace);
       List<StepAndPacket> nsStopEventSteps = getCreateNSStopEventSteps(packet, validationContext);
       stopRemovedNamespaces(validationContext);
@@ -280,18 +281,23 @@ public NextAction apply(Packet packet) {
 
     private List<StepAndPacket> getCreateNSStopEventSteps(Packet packet, NamespaceValidationContext validationContext) {
       return domainNamespaces.getNamespaces().stream()
-          .filter(validationContext::isNoLongerActiveDomainNamespace)
+          .filter(validationContext::isNotManaged)
           .map(n -> createNSStopEventDetails(packet, n)).collect(Collectors.toList());
     }
 
     private StepAndPacket createNSStopEventDetails(Packet packet, String namespace) {
       LOGGER.info(MessageKeys.END_MANAGING_NAMESPACE, namespace);
-      return new StepAndPacket(
-          Step.chain(
-              createEventStep(new EventData(NAMESPACE_WATCHING_STOPPED).resourceName(namespace).namespace(namespace)),
-              createEventStep(new EventData(STOP_MANAGING_NAMESPACE).resourceName(namespace)
-                  .namespace(getOperatorNamespace()))),
-          packet.copy());
+      return new StepAndPacket(getSteps(namespace), packet.copy());
+    }
+
+    private Step getSteps(String ns) {
+      List<Step> steps = new ArrayList<>();
+      if (!domainNamespaces.isStopping(ns).get()) {
+        steps.add(createEventStep(new EventData(NAMESPACE_WATCHING_STOPPED).resourceName(ns).namespace(ns)));
+      }
+      steps.add(createEventStep(
+          new EventData(STOP_MANAGING_NAMESPACE).resourceName(ns).namespace(getOperatorNamespace())));
+      return Step.chain(steps.toArray(new Step[0]));
     }
 
     private Step createNamespaceWatchStopEventsStep(List<StepAndPacket> nsStopEventDetails) {
@@ -333,9 +339,15 @@ private void stopRemovedNamespaces(NamespaceValidationContext validationContext)
   private static class NamespaceValidationContext {
 
     final Collection<String> allDomainNamespaces;
+    final DomainNamespaces domainNamespaces;
 
-    NamespaceValidationContext(Packet packet) {
+    NamespaceValidationContext(Packet packet, DomainNamespaces domainNamespaces) {
       allDomainNamespaces = Optional.ofNullable(getFoundDomainNamespaces(packet)).orElse(Collections.emptyList());
+      this.domainNamespaces = domainNamespaces;
+    }
+
+    private boolean isNotManaged(String ns) {
+      return !allDomainNamespaces.contains(ns) || domainNamespaces.isStopping(ns).get();
     }
 
     private boolean isNoLongerActiveDomainNamespace(String ns) {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2017, 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.kubernetes.operator;
@@ -445,7 +445,7 @@ void dispatchNamespaceWatch(Watch.Response<V1Namespace> item) {
       case "DELETED":
         // Mark the namespace as isStopping, which will cause the namespace be stopped
         // the next time when recheckDomains is triggered
-        mainDelegate.getDomainNamespaces().isStopping(ns).set(true);
+        Optional.ofNullable(mainDelegate.getDomainNamespaces().getStopping(ns)).ifPresent(n -> n.set(true));
 
         break;
 

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -368,7 +368,7 @@ private String createContainerPortName(List<V1ContainerPort> ports, String name)
   @Nonnull
   private String getPortNamePrefix(String name) {
     // Use first 12 characters of port name as prefix due to 15 character port name limit
-    return name.substring(0, 12);
+    return name.length() > 12 ? name.substring(0, 12) : name;
   }
 
   Integer getListenPort() {

operator/src/main/resources/scripts/introspectDomain.py

@@ -268,8 +268,8 @@ def getDynamicServersOrNone(self,cluster):
       childObjs = ls(returnMap='true', returnType='c')
       if not childObjs.isEmpty():
         cd(childObjs[0])
-        if get('ServerTemplate') is not None:
-          # Cluster is a dynamic cluster if a ServerTemplate MBean is found
+        if get('ServerTemplate') is not None or int(get('DynamicClusterSize')) > 0:
+          # Cluster is a dynamic cluster if a ServerTemplate MBean is found or DynamicClusterSize is greater than 0.
           ret = cmo
     except:
       trace("Ignoring cd() exception for cluster '" + cluster.getName() + "' in getDynamicServerOrNone() and returning None.")
@@ -611,7 +611,7 @@ def validateDynamicClusterReferencedByOneServerTemplate(self, cluster):
             self.addError("The WebLogic dynamic cluster " + self.name(cluster) + " is referenced the server template " + self.name(server_template) + " and the server template " + self.name(template) + ".")
             return
     if server_template is None:
-      self.addError("The WebLogic dynamic cluster " + self.name(cluster) + "' is not referenced by any server template.")
+      self.addError("The WebLogic dynamic cluster " + self.name(cluster) + " is not referenced by any server template.")
 
   def validateServerTemplateNapListenPortIsSet(self, server_or_template):
     naps = server_or_template.getNetworkAccessPoints()