Merge branch 'clarify-cluster-name-error-msg-42' into 'release/4.2'

Clarify error message when clusterName specified in cluster spec does not exists.

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

Author: rjeberhard

common/src/main/resources/Operator.properties

@@ -199,7 +199,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 clusterName ''{0}'' specified in the cluster resource ''{1}'' referenced by the domain resource does not exist in the WebLogic domain home 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

@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -21,8 +22,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 +127,13 @@ 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()
+            .map(cluster -> Map.entry(cluster.getSpec().getClusterName(),
+                    Objects.requireNonNull(cluster.getMetadata().getName())))
+            .filter(entry -> isUnknownCluster(entry.getKey()))
+            .forEach(entry -> reportUnknownCluster(entry.getKey(), entry.getValue()));
+
   }
 
   private List<ManagedServer> getManagedServers() {
@@ -155,8 +159,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 wlsClusterName, String refClusterName) {
+    reportFailure(NO_CLUSTER_IN_DOMAIN, wlsClusterName, refClusterName);
   }
 
   // Ensure that generated service names are valid.

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

@@ -463,7 +463,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
@@ -533,7 +533,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));
 
@@ -1027,7 +1027,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
@@ -1043,7 +1043,7 @@ void whenBothServerAndClusterDoNotExistInDomain_createEventWithBothWarnings() {
 
     assertThat(testSupport, hasEvent(DOMAIN_FAILED_EVENT)
                 .withMessageContaining(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")));
   }