Correct precreateServerService support

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/steps/ServerDownStep.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.operator.steps;
@@ -44,7 +44,7 @@ public class ServerDownStep extends Step {
       return doNext(createShutdownManagedServerStep(oldPod, next), packet);
     }
 
-    return doNext(packet);
+    return doNext(next, packet);
   }
 
   @Nonnull

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

@@ -910,17 +910,6 @@ void whenDomainScaledDownAndServerStateUnknown_removeExcessPods() {
     assertThat(getRunningPods().size(), equalTo(MIN_REPLICAS + NUM_ADMIN_SERVERS + NUM_JOB_PODS));
   }
 
-  @Test
-  void whenDomainWithoutPreCreateServerService_removeService() {
-    defineServerResources(ADMIN_NAME);
-    Arrays.stream(MANAGED_SERVER_NAMES).forEach(this::defineServerResources);
-    domainConfigurator.configureCluster(newInfo, CLUSTER).withReplicas(MIN_REPLICAS).withPrecreateServerService(false);
-    newInfo.getReferencedClusters().forEach(testSupport::defineResources);
-
-    createMakeRight(newInfo).execute();
-    assertThat((int) getServerServices().count(), equalTo(MIN_REPLICAS + NUM_ADMIN_SERVERS));
-  }
-
   @Test
   void whenDomainScaledDown_withPreCreateServerService_doesNotRemoveServices() {
     defineServerResources(ADMIN_NAME);
@@ -951,6 +940,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];