Merge branch 'correct-volmount-validation' into 'main'

Correct DOPV volume mounts validation, it should report error only if the...

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

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Validator.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2017, 2025, 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.weblogic.domain.model;
@@ -83,15 +83,21 @@ private void checkOverlappingMountPaths(DomainSpec spec, V1VolumeMount mount1, V
       return;
     }
 
-    List<String> list1 = getTokensWithCollection(mount1.getMountPath());
-    List<String> list2 = getTokensWithCollection(mount2.getMountPath());
-    for (int i = 0; i < Math.min(list1.size(), list2.size()); i++) {
-      if (!list1.get(i).equals(list2.get(i))) {
-        return;
+    if (spec.getDomainHome() != null) {
+      List<String> domainHomeTokens = getTokensWithCollection(spec.getDomainHome());
+      List<String> list1 = getTokensWithCollection(mount1.getMountPath());
+      List<String> list2 = getTokensWithCollection(mount2.getMountPath());
+      for (int i = 0; i < Math.min(list1.size(), list2.size()); i++) {
+        if (!list1.get(i).equals(list2.get(i))) {
+          return;
+        }
+      }
+      if (list1.getFirst().equals(domainHomeTokens.getFirst())
+          && list2.getFirst().equals(domainHomeTokens.getFirst())) {
+        failures.add(DomainValidationMessages.overlappingVolumeMountPath(mount1, mount2));
       }
     }
 
-    failures.add(DomainValidationMessages.overlappingVolumeMountPath(mount1, mount2));
   }
 
   private List<String> getTokensWithCollection(String str) {

operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainValidationTest.java

@@ -1403,6 +1403,7 @@ void whenPersistentVolumeClaimStorageClassNotSpecifiedUnderInitPvDomain_reportEr
   @Test
   void whenMultipleVolumeMountHaveOverlappingMountPath_initPvDomain_reportError() {
     configuredDomainWithInitializeDomainOnPVWithPVCVolume()
+        .withDomainHome("/domain-path1/domains/mydomain")
         .withAdditionalVolumeMount("volume1", "/domain-path1")
         .withAdditionalVolumeMount("volume2", "/domain-path1/dir1");
 
@@ -1414,6 +1415,7 @@ void whenMultipleVolumeMountHaveOverlappingMountPath_initPvDomain_reportError()
   @Test
   void whenMultipleVolumeMountHaveSameMountPath_initPvDomain_reportError() {
     configuredDomainWithInitializeDomainOnPVWithPVCVolume()
+        .withDomainHome("/domain-path1/dir1/dir2/mydomain")
         .withInitializeDomainOnPv(new InitializeDomainOnPV())
         .withAdditionalVolumeMount("volume1", "/domain-path1/dir1")
         .withAdditionalVolumeMount("volume2", "/domain-path1/dir1");