Merge pull request #158 from oracle/match-service-lifetime-pod

Restore per-managed server service lifetime

Author: rjeberhard

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

@@ -903,7 +903,7 @@ else if (StartupControlConstants.AUTO_STARTUPCONTROL.equals(sc)) {
           info.setServerStartupInfo(ssic);
           LOGGER.exiting();
           return doNext(scaleDownIfNecessary(info, servers, 
-              checkServerServices(info, new ManagedServerUpIteratorStep(ssic, next))), 
+              new ClusterServicesStep(info, new ManagedServerUpIteratorStep(ssic, next))), 
               packet);
         case StartupControlConstants.ADMIN_STARTUPCONTROL:
         case StartupControlConstants.NONE_STARTUPCONTROL:
@@ -912,7 +912,7 @@ else if (StartupControlConstants.AUTO_STARTUPCONTROL.equals(sc)) {
           info.setServerStartupInfo(null);
           LOGGER.exiting();
           return doNext(scaleDownIfNecessary(info, servers, 
-              checkServerServices(info, next)), 
+              new ClusterServicesStep(info, next)), 
               packet);
       }
     }
@@ -949,84 +949,18 @@ private static List<V1EnvVar> startInAdminMode(List<V1EnvVar> env) {
     return env;
   }
 
-  private static Step checkServerServices(DomainPresenceInfo info, Step next) {
-    Collection<String> allServers = new ArrayList<>();
-    Collection<ServerStartupInfo> ssic = new ArrayList<>();
-    
-    WlsDomainConfig scan = info.getScan();
-
-    // Iterate all servers
-    for (WlsClusterConfig wlsClusterConfig : scan.getClusterConfigs().values()) {
-      for (WlsServerConfig wlsServerConfig : wlsClusterConfig.getServerConfigs()) {
-        String serverName = wlsServerConfig.getListenAddress();
-        if (!allServers.contains(serverName)) {
-          allServers.add(serverName);
-          ssic.add(new ServerStartupInfo(wlsServerConfig, wlsClusterConfig, null, null));
-        }
-      }
-    }
-    for (Map.Entry<String, WlsServerConfig> wlsServerConfig : scan.getServerConfigs().entrySet()) {
-      String serverName = wlsServerConfig.getKey();
-      if (!allServers.contains(serverName)) {
-        allServers.add(serverName);
-        ssic.add(new ServerStartupInfo(wlsServerConfig.getValue(), null, null, null));
-      }
-    }
-
-    return new ManagedServerServicesStep(info, ssic, next);
-  }
-  
-  private static class ManagedServerServicesStep extends Step {
+  private static class ClusterServicesStep extends Step {
     private final DomainPresenceInfo info;
-    private final Collection<ServerStartupInfo> ssic;
 
-    public ManagedServerServicesStep(DomainPresenceInfo info, Collection<ServerStartupInfo> ssic, Step next) {
+    public ClusterServicesStep(DomainPresenceInfo info, Step next) {
       super(next);
       this.info = info;
-      this.ssic = ssic;
     }
 
     @Override
     public NextAction apply(Packet packet) {
       Collection<StepAndPacket> startDetails = new ArrayList<>();
 
-      for (ServerStartupInfo ssi : ssic) {
-        Packet p = packet.clone();
-        WlsServerConfig serverConfig = ssi.serverConfig;
-        ServerStartup serverStartup = ssi.serverStartup;
-        String serverName = serverConfig.getName();
-        p.put(ProcessingConstants.SERVER_SCAN, serverConfig);
-        p.put(ProcessingConstants.CLUSTER_SCAN, ssi.clusterConfig);
-        p.put(ProcessingConstants.ENVVARS, ssi.envVars);
-        
-        DomainSpec spec = info.getDomain().getSpec();
-        Integer nodePort = null;
-        if (serverStartup == null) {
-          List<ServerStartup> ssl = spec.getServerStartup();
-          if (ssl != null) {
-            for (ServerStartup ss : ssl) {
-              if (serverName.equals(ss.getServerName())) {
-                serverStartup = ss;
-                break;
-              }
-            }
-          }
-        }
-
-        if (serverStartup != null) {
-          nodePort = serverStartup.getNodePort();
-        }
-        
-        p.put(ProcessingConstants.SERVER_NAME, serverName);
-        if (ssi.clusterConfig != null) {
-          p.put(ProcessingConstants.CLUSTER_NAME, ssi.clusterConfig.getClusterName());
-        }
-        p.put(ProcessingConstants.PORT, serverConfig.getListenPort());
-        p.put(ProcessingConstants.NODE_PORT, nodePort);
-
-        startDetails.add(new StepAndPacket(ServiceHelper.createForServerStep(null), p));
-      }
-      
       // Add cluster services
       WlsDomainConfig scan = info.getScan();
       if (scan != null) {
@@ -1100,6 +1034,11 @@ public NextAction apply(Packet packet) {
         p.put(ProcessingConstants.CLUSTER_SCAN, ssi.clusterConfig);
         p.put(ProcessingConstants.ENVVARS, ssi.envVars);
 
+        p.put(ProcessingConstants.SERVER_NAME, ssi.serverConfig.getName());
+        p.put(ProcessingConstants.PORT, ssi.serverConfig.getListenPort());
+        ServerStartup ss = ssi.serverStartup;
+        p.put(ProcessingConstants.NODE_PORT, ss != null ? ss.getNodePort() : null);
+        
         startDetails.add(new StepAndPacket(bringManagedServerUp(ssi, null), p));
       }
 
@@ -1202,7 +1141,9 @@ public ServerDownStep(String serverName, ServerKubernetesObjects sko, Step next)
 
     @Override
     public NextAction apply(Packet packet) {
-      return doNext(PodHelper.deletePodStep(sko, new ServerDownFinalizeStep(serverName, next)), packet);
+      return doNext(PodHelper.deletePodStep(sko, 
+          ServiceHelper.deleteServiceStep(sko,
+              new ServerDownFinalizeStep(serverName, next))), packet);
     }
   }
 
@@ -1228,7 +1169,8 @@ public NextAction apply(Packet packet) {
   //                 "clusterScan"
   //                 "envVars"
   private static Step bringManagedServerUp(ServerStartupInfo ssi, Step next) {
-    return PodHelper.createManagedPodStep(next);
+    return PodHelper.createManagedPodStep(
+        ServiceHelper.createForServerStep(next));
   }
 
   private static void deleteDomainPresence(Domain dom) {

src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

@@ -161,6 +161,56 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
     }
   }
 
+  /**
+   * Factory for {@link Step} that deletes per-managed server service
+   * @param sko Server Kubernetes Objects
+   * @param next Next processing step
+   * @return Step for deleting per-managed server service
+   */
+  public static Step deleteServiceStep(ServerKubernetesObjects sko, Step next) {
+    return new DeleteServiceStep(sko, next);
+  }
+
+  private static class DeleteServiceStep extends Step {
+    private final ServerKubernetesObjects sko;
+
+    public DeleteServiceStep(ServerKubernetesObjects sko, Step next) {
+      super(next);
+      this.sko = sko;
+    }
+
+    @Override
+    public NextAction apply(Packet packet) {
+      DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
+      
+      Domain dom = info.getDomain();
+      V1ObjectMeta meta = dom.getMetadata();
+      String namespace = meta.getNamespace();
+      
+      // Set service to null so that watcher doesn't try to recreate service
+      V1Service oldService = sko.getService().getAndSet(null);
+      if (oldService != null) {
+        return doNext(CallBuilder.create().deleteServiceAsync(oldService.getMetadata().getName(), namespace, new ResponseStep<V1Status>(next) {
+          @Override
+          public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+              Map<String, List<String>> responseHeaders) {
+            if (statusCode == CallBuilder.NOT_FOUND) {
+              return onSuccess(packet, null, statusCode, responseHeaders);
+            }
+            return super.onFailure(packet, e, statusCode, responseHeaders);
+          }
+  
+          @Override
+          public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
+              Map<String, List<String>> responseHeaders) {
+            return doNext(next, packet);
+          }
+        }), packet);
+      }
+      return doNext(packet);
+    }
+  }
+
   /**
    * Create asynchronous step for internal cluster service
    * @param next Next processing step