work in progress

Author: rjeberhard

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

@@ -1006,6 +1006,9 @@ public NextAction apply(Packet packet) {
       }
 
       packet.put(ProcessingConstants.SERVER_NAME, scan.getName());
+      if (ssi.clusterConfig != null) {
+        packet.put(ProcessingConstants.CLUSTER_NAME, ssi.clusterConfig.getClusterName());
+      }
       packet.put(ProcessingConstants.PORT, scan.getListenPort());
       packet.put(ProcessingConstants.NODE_PORT, nodePort);
       return doNext(packet);

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

@@ -17,6 +17,7 @@ public interface ProcessingConstants {
   public static final String ENVVARS = "envVars";
 
   public static final String SERVER_NAME = "serverName";
+  public static final String CLUSTER_NAME = "clusterName";
   public static final String PORT = "port";
   public static final String NODE_PORT = "nodePort";
   public static final String NETWORK_ACCESS_POINT = "nap";

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

@@ -56,7 +56,7 @@ private AddServerStep(Step next) {
 
     @Override
     public NextAction apply(Packet packet) {
-      WlsClusterConfig clusterConfig = (WlsClusterConfig) packet.get(ProcessingConstants.CLUSTER_SCAN);
+      String clusterName = (String) packet.get(ProcessingConstants.CLUSTER_NAME);
       String serverName = (String) packet.get(ProcessingConstants.SERVER_NAME);
 
       DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
@@ -65,8 +65,7 @@ public NextAction apply(Packet packet) {
         V1Service service = sko.getService();
         if (service != null) {
           // If we have a cluster, create a cluster level ingress
-          if (clusterConfig != null) {
-            String clusterName = clusterConfig.getClusterName();
+          if (clusterName != null) {
             String ingressName = CallBuilder.toDNS1123LegalName(
                 info.getDomain().getSpec().getDomainUID() + "-" + clusterName);
             V1ObjectMeta meta = service.getMetadata();
@@ -96,6 +95,7 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
                       @Override
                       public NextAction onSuccess(Packet packet, V1beta1Ingress result, int statusCode,
                                                   Map<String, List<String>> responseHeaders) {
+                        sko.getIngresses().put(clusterName, result);
                         return doNext(packet);
                       }
                     }), packet);
@@ -113,6 +113,7 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
                       @Override
                       public NextAction onSuccess(Packet packet, V1beta1Ingress result, int statusCode,
                                                   Map<String, List<String>> responseHeaders) {
+                        sko.getIngresses().put(clusterName, result);
                         return doNext(packet);
                       }
                     }), packet);
@@ -153,6 +154,8 @@ private RemoveServerStep(String serverName, V1Service service, Step next) {
     @Override
     public NextAction apply(Packet packet) {
       DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
+      ServerKubernetesObjects sko = info.getServers().get(serverName);
+      String clusterName = (String) packet.get(ProcessingConstants.CLUSTER_NAME);
       V1ObjectMeta meta = service.getMetadata();
 
       String ingressName;
@@ -197,6 +200,7 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
                   @Override
                   public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
                                               Map<String, List<String>> responseHeaders) {
+                    sko.getIngresses().remove(clusterName);
                     return doNext(packet);
                   }
                 }), packet);
@@ -211,6 +215,7 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
                   @Override
                   public NextAction onSuccess(Packet packet, V1beta1Ingress result, int statusCode,
                                               Map<String, List<String>> responseHeaders) {
+                    sko.getIngresses().put(clusterName, result);
                     return doNext(packet);
                   }
                 }), packet);

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

@@ -8,6 +8,7 @@
 
 import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.models.V1beta1Ingress;
 
 /**
  * Kubernetes pods and services associated with a single WebLogic server
@@ -17,6 +18,7 @@ public class ServerKubernetesObjects {
   private V1Pod pod = null;
   private V1Service service = null;
   private Map<String, V1Service> channels = null;
+  private Map<String, V1beta1Ingress> ingresses = null;
 
   /**
    * The Pod
@@ -50,10 +52,25 @@ public void setService(V1Service service) {
     this.service = service;
   }
 
+  /**
+   * Channel map
+   * @return Map from channel name to Service
+   */
   public Map<String, V1Service> getChannels() {
     if (channels == null) {
       channels = new HashMap<String, V1Service>();
     }
     return channels;
   }
+  
+  /**
+   * Ingress map
+   * @return Map from cluster name to Ingress
+   */
+  public Map<String, V1beta1Ingress> getIngresses() {
+    if (ingresses == null) {
+      ingresses = new HashMap<String, V1beta1Ingress>();
+    }
+    return ingresses;
+  }
 }