Create per-cluster Ingress following per-cluster Service

Author: rjeberhard

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

@@ -1007,8 +1007,7 @@ private static Step checkServerServices(DomainPresenceInfo info, Step next) {
       }
     }
 
-    return new ManagedServerServicesStep(info, ssic, 
-        IngressHelper.createClusterStep(next));
+    return new ManagedServerServicesStep(info, ssic, next);
   }
 
   private static class ManagedServerServicesStep extends Step {
@@ -1028,16 +1027,34 @@ public NextAction apply(Packet packet) {
       for (ServerStartupInfo ssi : ssic) {
         Packet p = packet.clone();
         WlsServerConfig serverConfig = ssi.serverConfig;
-        ServerStartup ss = ssi.serverStartup;
+        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 (ss != null) {
-          nodePort = ss.getNodePort();
+        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();
+        }
+        if (nodePort == null && serverName.equals(spec.getAsName())) {
+          nodePort = spec.getAsNodePort();
         }
 
-        p.put(ProcessingConstants.SERVER_NAME, serverConfig.getName());
+        p.put(ProcessingConstants.SERVER_NAME, serverName);
         if (ssi.clusterConfig != null) {
           p.put(ProcessingConstants.CLUSTER_NAME, ssi.clusterConfig.getClusterName());
         }
@@ -1060,7 +1077,9 @@ public NextAction apply(Packet packet) {
             break;
           }
 
-          startDetails.add(new StepAndPacket(ServiceHelper.createForClusterStep(null), p));
+          startDetails.add(new StepAndPacket(
+              ServiceHelper.createForClusterStep(
+                  IngressHelper.createClusterStep(null)), p));
         }
       }
 

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

@@ -119,6 +119,12 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
             Map<String, List<String>> responseHeaders) {
           if (result == null) {
             Step create = CallBuilder.create().createServiceAsync(namespace, service, new ResponseStep<V1Service>(next) {
+              @Override
+              public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+                  Map<String, List<String>> responseHeaders) {
+                return super.onFailure(ForServerStep.this, packet, e, statusCode, responseHeaders);
+              }
+
               @Override
               public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
                   Map<String, List<String>> responseHeaders) {
@@ -226,6 +232,12 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
             Map<String, List<String>> responseHeaders) {
           if (result == null) {
             Step create = CallBuilder.create().createServiceAsync(namespace, service, new ResponseStep<V1Service>(next) {
+              @Override
+              public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+                  Map<String, List<String>> responseHeaders) {
+                return super.onFailure(ForClusterStep.this, packet, e, statusCode, responseHeaders);
+              }
+              
               @Override
               public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
                   Map<String, List<String>> responseHeaders) {
@@ -245,20 +257,27 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
             return doNext(packet);
           } else {
             // we need to cycle the Service
+            info.getClusters().remove(clusterName);
             Step delete = CallBuilder.create().deleteServiceAsync(namespace, name, 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);
+                return super.onFailure(ForClusterStep.this, packet, e, statusCode, responseHeaders);
               }
 
               @Override
               public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
                   Map<String, List<String>> responseHeaders) {
                 Step create = CallBuilder.create().createServiceAsync(namespace, service, new ResponseStep<V1Service>(next) {
+                  @Override
+                  public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+                      Map<String, List<String>> responseHeaders) {
+                    return super.onFailure(ForClusterStep.this, packet, e, statusCode, responseHeaders);
+                  }
+                  
                   @Override
                   public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
                       Map<String, List<String>> responseHeaders) {
@@ -356,13 +375,19 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
           if (statusCode == CallBuilder.NOT_FOUND) {
             return onSuccess(packet, null, statusCode, responseHeaders);
           }
-          return super.onFailure(packet, e, statusCode, responseHeaders);
+          return super.onFailure(CycleServiceStep.this, packet, e, statusCode, responseHeaders);
         }
 
         @Override
         public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
             Map<String, List<String>> responseHeaders) {
           Step create = CallBuilder.create().createServiceAsync(namespace, newService, new ResponseStep<V1Service>(next) {
+            @Override
+            public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+                Map<String, List<String>> responseHeaders) {
+              return super.onFailure(CycleServiceStep.this, packet, e, statusCode, responseHeaders);
+            }
+
             @Override
             public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
                 Map<String, List<String>> responseHeaders) {
@@ -459,14 +484,20 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
           if (statusCode == CallBuilder.NOT_FOUND) {
             return onSuccess(packet, null, statusCode, responseHeaders);
           }
-          return super.onFailure(packet, e, statusCode, responseHeaders);
+          return super.onFailure(ForExternalChannelStep.this, packet, e, statusCode, responseHeaders);
         }
 
         @Override
         public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
             Map<String, List<String>> responseHeaders) {
           if (result == null) {
             Step create = CallBuilder.create().createServiceAsync(namespace, service, new ResponseStep<V1Service>(next) {
+              @Override
+              public NextAction onFailure(Packet packet, ApiException e, int statusCode,
+                  Map<String, List<String>> responseHeaders) {
+                return super.onFailure(ForExternalChannelStep.this, packet, e, statusCode, responseHeaders);
+              }
+              
               @Override
               public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
                   Map<String, List<String>> responseHeaders) {