Merge branch 'cherry-pick-02a1962d' into 'release/4.0'

Backport: Owls109699 Check existence of status to identify a new domain/cluster

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

Author: rjeberhard

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

@@ -230,9 +230,9 @@ private boolean isNotBeingProcessed(String namespace, String domainUid) {
 
   private void addDomain(DomainResource domain) {
     DomainPresenceInfo cachedInfo = getDomainPresenceInfoMap().get(domain.getDomainUid());
-    if (cachedInfo == null) {
+    if (domain.getStatus() == null) {
       newDomainNames.add(domain.getDomainUid());
-    } else if (domain.isGenerationChanged(cachedInfo.getDomain())) {
+    } else if (cachedInfo != null && domain.isGenerationChanged(cachedInfo.getDomain())) {
       modifiedDomainNames.add(domain.getDomainUid());
     }
     getOrComputeDomainPresenceInfo(domain.getDomainUid()).setDomain(domain);
@@ -245,9 +245,9 @@ private void addClusterList(ClusterList list) {
 
   private void addCluster(ClusterResource cluster) {
     ClusterPresenceInfo cachedInfo = getClusterPresenceInfoMap().get(getClusterName(cluster));
-    if (cachedInfo == null) {
+    if (cluster.getStatus() == null) {
       newClusterNames.add(getClusterName(cluster));
-    } else if (cluster.isGenerationChanged(cachedInfo.getCluster())) {
+    } else if (cachedInfo != null && cluster.isGenerationChanged(cachedInfo.getCluster())) {
       modifiedClusterNames.add(getClusterName(cluster));
     }
 
@@ -296,7 +296,7 @@ private void activateDomain(DomainProcessor dp, DomainPresenceInfo info) {
   }
 
   private EventItem getEventItem(DomainPresenceInfo info) {
-    if (newDomainNames.contains(info.getDomainUid()) || info.getDomain().getStatus() == null) {
+    if (newDomainNames.contains(info.getDomainUid())) {
       return DOMAIN_CREATED;
     }
     if (modifiedDomainNames.contains(info.getDomainUid())) {
@@ -306,7 +306,7 @@ private EventItem getEventItem(DomainPresenceInfo info) {
   }
 
   private EventItem getEventItem(ClusterResource cluster) {
-    if (newClusterNames.contains(getClusterName(cluster)) || cluster.getStatus() == null) {
+    if (newClusterNames.contains(getClusterName(cluster))) {
       return CLUSTER_CREATED;
     }
     if (modifiedClusterNames.contains(getClusterName(cluster))) {

operator/src/test/java/oracle/kubernetes/operator/DomainPresenceTest.java

@@ -359,15 +359,27 @@ void whenK8sHasOneDomain_recordAdminServerService() {
   }
 
   @Test
-  void whenNewDomainAdded_generateDomainCreatedEvent() {
+  void whenNewDomainAddedWithoutStatus_generateDomainCreatedEvent() {
     processor.getDomainPresenceInfoMap().clear();
     addDomainResource(UID1, NS);
+    DomainResource domain = testSupport.getResourceWithName(DOMAIN, UID1);
+    domain.withStatus(null);
 
     testSupport.runSteps(domainNamespaces.readExistingResources(NS, processor));
 
     assertThat(testSupport, hasEvent(DOMAIN_CREATED.getReason()));
   }
 
+  @Test
+  void whenNewDomainAddedWithStatus_dontGenerateDomainCreatedEvent() {
+    processor.getDomainPresenceInfoMap().clear();
+    addDomainResource(UID1, NS);
+
+    testSupport.runSteps(domainNamespaces.readExistingResources(NS, processor));
+
+    assertThat(testSupport, not(hasEvent(DOMAIN_CREATED.getReason())));
+  }
+
   @Test
   void whenDomainChanged_generateDomainChangedEvent() {
     DomainResource domain1 = createDomain(UID1, NS);

operator/src/test/java/oracle/kubernetes/operator/DomainProcessorTest.java

@@ -1040,16 +1040,29 @@ void whenMakeRightExecuted_ignoreNonOperatorPodDisruptionBudgets() {
   }
 
   @Test
-  void whenNewClusterAdded_generateClusterCreatedEvent() {
+  void whenNewClusterAddedWithoutStatus_generateClusterCreatedEvent() {
     processor.getClusterPresenceInfoMap().values().clear();
     ClusterResource cluster1 = createClusterAlone(CLUSTER4, NS);
+    cluster1.setStatus(null);
     testSupport.defineResources(cluster1);
 
     testSupport.runSteps(domainNamespaces.readExistingResources(NS, processor));
 
     assertThat(testSupport, hasEvent(CLUSTER_CREATED.getReason()));
   }
 
+  @Test
+  void whenNewClusterAddedWithStatus_dontGenerateClusterCreatedEvent() {
+    processor.getClusterPresenceInfoMap().values().clear();
+    ClusterResource cluster1 = createClusterAlone(CLUSTER4, NS);
+    cluster1.setStatus(new ClusterStatus());
+    testSupport.defineResources(cluster1);
+
+    testSupport.runSteps(domainNamespaces.readExistingResources(NS, processor));
+
+    assertThat(testSupport, not(hasEvent(CLUSTER_CREATED.getReason())));
+  }
+
   @Test
   void whenClusterChanged_generateClusterChangedEvent() {
     ClusterStatus status = new ClusterStatus().withClusterName(CLUSTER4);