Merge branch 'owls-124126' into 'main'

report referenced cluster resource name when cluster name mismatch

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

Author: rjeberhard

common/src/main/resources/Operator.properties

@@ -183,7 +183,7 @@ WLSDO-0007=Configuration overridesConfigMap ''{0}'' is not supported if ''domain
 WLSDO-0008=ConfigMap ''{0}'' specified by ''{1}'' not found in namespace ''{2}''.
 WLSDO-0009=The secret ''{0}'' must be specified if ''domainHomeSourceType'' is configured as ''FromModel''.
 WLSDO-0010=The secret ''{0}'' must be specified if ''domainHomeSourceType'' is configured as ''FromModel'' and spec.configuration.model.domainType is configured as ''JRF''.
-WLSDO-0011=Cluster ''{0}'' specified in the domain resource does not exist in the WebLogic domain home configuration.
+WLSDO-0011=The Cluster resource ''{0}'' with clusterName ''{1}'' specified does not exist in the WebLogic domain home (config.xml) configuration.
 WLSDO-0012=Managed Server ''{0}'' specified in the domain resource does not exist in the WebLogic domain home configuration.
 WLSDO-0013=Istio is enabled and the domain resource specified to expose channel {0} in the adminServices section. The channel name default, \
 default-admin, default-secure are internal to the WebLogic Kubernetes Operator. Please create the network channel with a different name in the WebLogic Domain before \

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

@@ -21,8 +21,6 @@
 import oracle.kubernetes.operator.wlsconfig.WlsDynamicServersConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
 import oracle.kubernetes.operator.work.Packet;
-import oracle.kubernetes.weblogic.domain.model.ClusterResource;
-import oracle.kubernetes.weblogic.domain.model.ClusterSpec;
 import oracle.kubernetes.weblogic.domain.model.ManagedServer;
 import oracle.kubernetes.weblogic.domain.model.MonitoringExporterSpecification;
 import org.apache.commons.collections4.ListUtils;
@@ -128,8 +126,12 @@ List<String> getTopologyFailures() {
   private void verifyDomainResourceReferences() {
     getManagedServers().stream()
           .map(ManagedServer::getServerName).filter(this::isUnknownServer).forEach(this::reportUnknownServer);
-    info.getReferencedClusters().stream().map(ClusterResource::getSpec)
-          .map(ClusterSpec::getClusterName).filter(this::isUnknownCluster).forEach(this::reportUnknownCluster);
+    info.getReferencedClusters().stream()
+            .filter(cluster -> isUnknownCluster(cluster.getSpec().getClusterName()))
+            .forEach(cluster -> reportUnknownCluster(
+                    cluster.getSpec().getClusterName(),
+                    cluster.getClusterResourceName()
+            ));
   }
 
   private List<ManagedServer> getManagedServers() {
@@ -155,8 +157,8 @@ private boolean isUnknownCluster(String clusterName) {
     return !domainConfig.containsCluster(clusterName);
   }
 
-  private void reportUnknownCluster(String clusterName) {
-    reportFailure(NO_CLUSTER_IN_DOMAIN, clusterName);
+  private void reportUnknownCluster(String clusterName, String clusterResourceName) {
+    reportFailure(NO_CLUSTER_IN_DOMAIN, clusterResourceName, clusterName);
   }
 
   // Ensure that generated service names are valid.

operator/src/test/java/oracle/kubernetes/operator/helpers/TopologyValidationStepTest.java

@@ -462,7 +462,7 @@ void whenClusterDoesNotExistInDomain_logWarning() {
 
     runTopologyValidationStep();
 
-    assertTopologyMismatchReported(NO_CLUSTER_IN_DOMAIN, "no-such-cluster");
+    assertTopologyMismatchReported(NO_CLUSTER_IN_DOMAIN, "no-such-cluster", "no-such-cluster");
   }
 
   @Test
@@ -532,7 +532,7 @@ void removeOldReplicasTooHighFailures() {
   void preserveTopologyFailuresThatStillExist() {
     consoleControl.ignoreMessage(NO_CLUSTER_IN_DOMAIN);
     final OffsetDateTime initialTime = SystemClock.now();
-    final String message = getFormattedMessage(NO_CLUSTER_IN_DOMAIN, "no-such-cluster");
+    final String message = getFormattedMessage(NO_CLUSTER_IN_DOMAIN, "no-such-cluster", "no-such-cluster");
     domain.getStatus().addCondition(new DomainCondition(FAILED).withReason(TOPOLOGY_MISMATCH)
         .withFailureInfo(domain.getSpec()).withMessage(message));
 
@@ -1026,7 +1026,7 @@ void whenClusterDoesNotExistInDomain_logWarningAndCreateEvent() {
 
     runTopologyValidationStep();
 
-    assertTopologyMismatchReported(NO_CLUSTER_IN_DOMAIN, "no-such-cluster");
+    assertTopologyMismatchReported(NO_CLUSTER_IN_DOMAIN, "no-such-cluster", "no-such-cluster");
   }
 
   @Test
@@ -1042,7 +1042,7 @@ void whenBothServerAndClusterDoNotExistInDomain_createEventWithBothWarnings() {
 
     assertThat(testSupport, hasEvent(DOMAIN_FAILED_EVENT)
                 .withNoteContaining(getLocalizedString(TOPOLOGY_MISMATCH_EVENT_ERROR),
-                      getFormattedMessage(NO_CLUSTER_IN_DOMAIN, "no-such-cluster"),
+                      getFormattedMessage(NO_CLUSTER_IN_DOMAIN, "no-such-cluster", "no-such-cluster"),
                       getFormattedMessage(NO_MANAGED_SERVER_IN_DOMAIN, "no-such-server")));
   }