Merge pull request #101 from oracle/doxiao/scale-down-to-zero

Fix an issue in scale down to 0 replica

Author: rjeberhard

src/main/java/oracle/kubernetes/operator/Main.java

@@ -527,7 +527,7 @@ public ListPersistentVolumeClaimStep(Step next) {
     @Override
     public NextAction apply(Packet packet) {
       DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
-      
+       
       Domain dom = info.getDomain();
       V1ObjectMeta meta = dom.getMetadata();
       DomainSpec spec = dom.getSpec();
@@ -720,6 +720,10 @@ public NextAction apply(Packet packet) {
                 for (WlsServerConfig wlsServerConfig : wlsClusterConfig.getServerConfigs()) {
                   String serverName = wlsServerConfig.getName();
                   if (!serverName.equals(asName) && !servers.contains(serverName)) {
+                    // done with the current cluster
+                    if (startedCount >= cs.getReplicas() && !startAll) 
+                      continue cluster;
+
                     List<V1EnvVar> env = cs.getEnv();
                     ServerStartup ssi = null;
                     ssl = spec.getServerStartup();
@@ -739,8 +743,7 @@ public NextAction apply(Packet packet) {
                       env = startInAdminMode(env);
                     }
                     ssic.add(new ServerStartupInfo(wlsServerConfig, wlsClusterConfig, env, ssi));
-                    if (++startedCount >= cs.getReplicas() && !startAll)
-                      continue cluster;
+                    startedCount++;
                   }
                 }
               }
@@ -1374,4 +1377,4 @@ public static Collection<NetworkAccessPoint> adminChannelsToCreate(WlsDomainConf
     LOGGER.exiting();
     return validatedChannels;
   }
-}
+}