Merge branch 'OWLS-0127038' into 'release/4.2'

Correct the behavior when precreateService for server service in cluster...

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

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServersUpStep.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2023, 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.operator.steps;
@@ -105,7 +105,8 @@ private static List<ServerShutdownInfo> getServersToStop(
   private static boolean isNotAlreadyStoppedOrServiceOnly(DomainPresenceInfo info, ServerShutdownInfo ssi) {
     return (info.getServerPod(ssi.getServerName()) != null
             && !info.isServerPodBeingDeleted(ssi.getServerName()))
-            || (ssi.isServiceOnly() && info.getServerService(ssi.getServerName()) == null);
+            || (ssi.isServiceOnly() && (info.getServerService(ssi.getServerName()) == null)
+            || (!ssi.isServiceOnly() && (info.getServerService(ssi.getServerName()) != null)));
   }
 
   private static void insert(List<Step> steps, Step step) {

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

@@ -363,7 +363,7 @@ public Boolean isPrecreateServerService() {
     return serverService.isPrecreateService();
   }
 
-  void setPrecreateServerService(boolean value) {
+  public void setPrecreateServerService(boolean value) {
     serverService.setIsPrecreateService(value);
   }
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2019, 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.operator;
@@ -937,6 +937,22 @@ void whenDomainScaledDown_withoutPreCreateServerService_removeService() {
     assertThat(getServerService(SERVER3).isPresent(), is(false));
   }
 
+  @Test
+  void whenDomainWithoutPreCreateServerService_removeService() {
+    defineServerResources(ADMIN_NAME);
+    Arrays.stream(MANAGED_SERVER_NAMES).forEach(this::defineServerResources);
+    domainConfigurator.configureCluster(newInfo, CLUSTER).withReplicas(MIN_REPLICAS).withPrecreateServerService(true);
+    newInfo.getReferencedClusters().forEach(testSupport::defineResources);
+
+    createMakeRight(newInfo).execute();
+    assertThat((int) getServerServices().count(), equalTo(MAX_SERVERS + NUM_ADMIN_SERVERS));
+    newInfo.getReferencedClusters().getFirst().getSpec().setPrecreateServerService(false);
+    newDomain.getSpec().setPrecreateServerService(false);
+    newDomain.getMetadata().setCreationTimestamp(SystemClock.now());
+    processor.createMakeRightOperation(newInfo).withExplicitRecheck().execute();
+    assertThat((int) getServerServices().count(), equalTo(MIN_REPLICAS + NUM_ADMIN_SERVERS));
+  }
+
   @Test
   void whenDomainScaledDown_withPreCreateServerService_createClusterIPService() {
     final String SERVER3 = MANAGED_SERVER_NAMES[2];