Merge pull request #587 from oracle/owls-69882

OWLS-69882: Add support for an admin server administration node port …

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/AdminServerConfigurator.java

@@ -4,6 +4,7 @@
 
 package oracle.kubernetes.weblogic.domain;
 
+import oracle.kubernetes.weblogic.domain.v2.AdminService;
 import oracle.kubernetes.weblogic.domain.v2.ExportedNetworkAccessPoint;
 
 @SuppressWarnings("UnusedReturnValue")
@@ -18,4 +19,6 @@ public interface AdminServerConfigurator extends ServerConfigurator {
   AdminServerConfigurator withNodePortLabel(String name, String value);
 
   AdminServerConfigurator withNodePortAnnotation(String name, String value);
+
+  AdminService configureAdminService();
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/AdminServer.java

@@ -26,6 +26,11 @@ public class AdminServer extends Server {
   @Description("T3 network access points to export")
   private Map<String, ExportedNetworkAccessPoint> exportedNetworkAccessPoints = new HashMap<>();
 
+  @Description(
+      "Configures which of the admin server's WebLogic admin channels should be exposed outside"
+          + " the Kubernetes cluster via a node port service.")
+  private AdminService adminService;
+
   /**
    * Configures an exported T3 network access point.
    *
@@ -54,6 +59,7 @@ public String toString() {
         .append("exportedNetworkAccessPoints", exportedNetworkAccessPoints)
         .append("nodePortLabels", nodePortLabels)
         .append("nodePortAnnotations", nodePortAnnotations)
+        .append("adminService", adminService)
         .toString();
   }
 
@@ -70,6 +76,7 @@ public boolean equals(Object o) {
         .append(exportedNetworkAccessPoints, that.exportedNetworkAccessPoints)
         .append(nodePortLabels, that.nodePortLabels)
         .append(nodePortAnnotations, that.nodePortAnnotations)
+        .append(adminService, that.adminService)
         .isEquals();
   }
 
@@ -80,6 +87,7 @@ public int hashCode() {
         .append(exportedNetworkAccessPoints)
         .append(nodePortLabels)
         .append(nodePortAnnotations)
+        .append(adminService)
         .toHashCode();
   }
 
@@ -94,4 +102,12 @@ void addNodePortLabels(String name, String value) {
   void addNodePortAnnotations(String name, String value) {
     nodePortAnnotations.put(name, value);
   }
+
+  public AdminService getAdminService() {
+    return adminService;
+  }
+
+  public void setAdminService(AdminService adminService) {
+    this.adminService = adminService;
+  }
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/AdminService.java

@@ -0,0 +1,82 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.weblogic.domain.v2;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class AdminService {
+  /** */
+  @SerializedName("labels")
+  private Map<String, String> labels = new HashMap<>();
+  /** */
+  @SerializedName("annotations")
+  private Map<String, String> annotations = new HashMap<>();
+  /** */
+  @SerializedName("channels")
+  private Map<String, Channel> channels = new HashMap<>();
+
+  public AdminService addLabel(String name, String value) {
+    labels.put(name, value);
+    return this;
+  }
+
+  public Map<String, String> getLabels() {
+    return Collections.unmodifiableMap(labels);
+  }
+
+  public AdminService addAnnotation(String name, String value) {
+    annotations.put(name, value);
+    return this;
+  }
+
+  public Map<String, String> getAnnotations() {
+    return Collections.unmodifiableMap(annotations);
+  }
+
+  public AdminService addChannel(String name, Channel port) {
+    channels.put(name, port);
+    return this;
+  }
+
+  public Map<String, Channel> getChannels() {
+    return channels;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this)
+        .append("labels", labels)
+        .append("annotations", annotations)
+        .append("channles", channels)
+        .toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder().append(labels).append(annotations).append(channels).toHashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null) {
+      return false;
+    }
+    if (!(o instanceof AdminService)) {
+      return false;
+    }
+    AdminService as = (AdminService) o;
+    return new EqualsBuilder()
+        .append(labels, as.labels)
+        .append(annotations, as.annotations)
+        .append(channels, as.channels)
+        .isEquals();
+  }
+}

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Channel.java

@@ -0,0 +1,51 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.weblogic.domain.v2;
+
+import com.google.gson.annotations.SerializedName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class Channel {
+  public Channel() {}
+
+  public Channel(int nodePort) {
+    this.nodePort = nodePort;
+  }
+
+  @SerializedName("nodePort")
+  private int nodePort;
+
+  public int getNodePort() {
+    return nodePort;
+  }
+
+  public void setNodePort(int nodePort) {
+    this.nodePort = nodePort;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this).append("nodePort", nodePort).toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder().append(nodePort).toHashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null) {
+      return false;
+    }
+    if (!(o instanceof Channel)) {
+      return false;
+    }
+    Channel ch = (Channel) o;
+    return new EqualsBuilder().append(nodePort, ch.nodePort).isEquals();
+  }
+}

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -559,7 +559,7 @@ private boolean hasMaxUnavailable(Cluster cluster) {
     return cluster != null && cluster.getMaxUnavailable() != null;
   }
 
-  private AdminServer getAdminServer() {
+  public AdminServer getAdminServer() {
     return Optional.ofNullable(adminServer).orElse(AdminServer.NULL_ADMIN_SERVER);
   }
 

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -154,6 +154,14 @@ public AdminServerConfigurator withExportedNetworkAccessPoints(String... names)
     public ExportedNetworkAccessPoint configureExportedNetworkAccessPoint(String channelName) {
       return adminServer.addExportedNetworkAccessPoint(channelName);
     }
+
+    @Override
+    public AdminService configureAdminService() {
+      if (adminServer.getAdminService() == null) {
+        adminServer.setAdminService(new AdminService());
+      }
+      return adminServer.getAdminService();
+    }
   }
 
   private AdminServer getOrCreateAdminServer() {

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

@@ -989,6 +989,11 @@ private static Step[] bringAdminServerUpSteps(DomainPresenceInfo info, Step next
     List<Step> resources = new ArrayList<>();
     resources.add(PodHelper.createAdminPodStep(null));
     resources.add(new BeforeAdminServiceStep(null));
+
+    if (dom.getSpec().getAdminServer().getAdminService() != null) {
+      resources.add(ServiceHelper.createForAdminServiceStep(null));
+    }
+
     resources.add(ServiceHelper.createForServerStep(null));
     resources.add(new WatchPodReadyAdminStep(Main.podWatchers, null));
     resources.add(new ExternalAdminChannelsStep(next));

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

@@ -13,6 +13,7 @@ public class LegalNames {
   private static final String CLUSTER_SERVICE_PATTERN = "%s-cluster-%s";
   private static final String NAP_PATTERN = "%s-%s-extchannel-%s";
   private static final String DOMAIN_INTROSPECTOR_JOB_PATTERN = "%s-introspect-domain-job";
+  private static final String ADMIN_SERVICE_PATTERN = "%s-%s-admin";
 
   public static String toServerServiceName(String domainUID, String serverName) {
     return toServerName(domainUID, serverName);
@@ -38,6 +39,9 @@ static String toJobIntrospectorName(String domainUID) {
     return toDNS1123LegalName(String.format(DOMAIN_INTROSPECTOR_JOB_PATTERN, domainUID));
   }
 
+  static String toAdminServiceName(String domainUID, String serverName) {
+    return toDNS1123LegalName(String.format(ADMIN_SERVICE_PATTERN, domainUID, serverName));
+  }
   /**
    * Converts value to nearest DNS-1123 legal name, which can be used as a Kubernetes identifier
    *