Remove asNodePort and use ServerStartup's nodePort instead

Signed-off-by: Dongbo Xiao <dongbo.xiao@oracle.com>

Author: doxiao

kubernetes/internal/domain-custom-resource-template.yaml

@@ -28,8 +28,6 @@ spec:
   asName: "%ADMIN_SERVER_NAME%"
   # The Admin Server's ListenPort
   asPort: %ADMIN_PORT%
-  # The Admin Server's NodePort
-  %EXPOSE_ADMIN_PORT_PREFIX%asNodePort: %ADMIN_NODE_PORT%
   # startupControl legal values are "ALL", "ADMIN", "SPECIFIED", or "AUTO"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
   # - "ALL" will start up all defined servers
@@ -49,6 +47,8 @@ spec:
   - desiredState: "RUNNING"
     # the name of the server to apply these rules to
     serverName: "%ADMIN_SERVER_NAME%"
+    # The Admin Server's NodePort
+    %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%
     # an (optional) list of environment variable to be set on the server
     env:
     - name: JAVA_OPTIONS

src-generated-swagger/main/java/oracle/kubernetes/operator/domain/model/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

@@ -49,9 +49,6 @@ public class DomainSpec {
   @SerializedName("asPort")
   private Integer asPort = null;
 
-  @SerializedName("asNodePort")
-  private Integer asNodePort = null;
-
   @SerializedName("asEnv")
   private List<io.kubernetes.client.models.V1EnvVar> asEnv = null;
 
@@ -208,28 +205,6 @@ public void setAsPort(Integer asPort) {
     this.asPort = asPort;
   }
 
-  public DomainSpec asNodePort(Integer asNodePort) {
-    this.asNodePort = asNodePort;
-    return this;
-  }
-
-  /**
-   * Administration server NodePort port. The port on each node on which the
-   * administration server will be exposed. If specified, this value must be an
-   * unused port. By default, the administration server will not be exposed
-   * outside the Kubernetes cluster.
-   * 
-   * @return asNodePort
-   **/
-  @ApiModelProperty(value = "Administration server NodePort port.  The port on each node on which the administration server will be exposed.  If specified, this value must be an unused port.  By default, the administration server will not be exposed outside the Kubernetes cluster.")
-  public Integer getAsNodePort() {
-    return asNodePort;
-  }
-
-  public void setAsNodePort(Integer asNodePort) {
-    this.asNodePort = asNodePort;
-  }
-
   public DomainSpec asEnv(List<io.kubernetes.client.models.V1EnvVar> asEnv) {
     this.asEnv = asEnv;
     return this;
@@ -409,7 +384,6 @@ public boolean equals(java.lang.Object o) {
         && Objects.equals(this.adminSecret, oracleKubernetesWeblogicDomainV1DomainSpec.adminSecret)
         && Objects.equals(this.asName, oracleKubernetesWeblogicDomainV1DomainSpec.asName)
         && Objects.equals(this.asPort, oracleKubernetesWeblogicDomainV1DomainSpec.asPort)
-        && Objects.equals(this.asNodePort, oracleKubernetesWeblogicDomainV1DomainSpec.asNodePort)
         && Objects.equals(this.asEnv, oracleKubernetesWeblogicDomainV1DomainSpec.asEnv)
         && Objects.equals(this.exportT3Channels, oracleKubernetesWeblogicDomainV1DomainSpec.exportT3Channels)
         && Objects.equals(this.startupControl, oracleKubernetesWeblogicDomainV1DomainSpec.startupControl)
@@ -420,7 +394,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, asNodePort, asEnv,
+    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, asEnv,
         exportT3Channels, startupControl, serverStartup, clusterStartup, replicas);
   }
 
@@ -436,7 +410,6 @@ public String toString() {
     sb.append("    adminSecret: ").append(toIndentedString(adminSecret)).append("\n");
     sb.append("    asName: ").append(toIndentedString(asName)).append("\n");
     sb.append("    asPort: ").append(toIndentedString(asPort)).append("\n");
-    sb.append("    asNodePort: ").append(toIndentedString(asNodePort)).append("\n");
     sb.append("    asEnv: ").append(toIndentedString(asEnv)).append("\n");
     sb.append("    exportT3Channels: ").append(toIndentedString(exportT3Channels)).append("\n");
     sb.append("    startupControl: ").append(toIndentedString(startupControl)).append("\n");

src/integration-tests/bash/run.sh

@@ -1051,15 +1051,15 @@ function verify_admin_server_ext_service {
 
     trace "verify that admin server REST and console are accessible from outside of the kubernetes cluster"
 
-    local get_configured_nodePort="kubectl get domains -n $NAMESPACE -o jsonpath='{.items[?(@.metadata.name == \"$DOMAIN_UID\")].spec.asNodePort}'"
+    local get_configured_nodePort="kubectl get domains -n $NAMESPACE -o jsonpath='{.items[?(@.metadata.name == \"$DOMAIN_UID\")].spec.serverStartup[?(@.serverName == \"admin-server\")].nodePort}'"
 
     local configuredNodePort=`eval $get_configured_nodePort`
 
-    trace "configured asNodePort in domain $DOMAIN_UID is ${configuredNodePort}"
+    trace "configured NodePort for the admin server in domain $DOMAIN_UID is ${configuredNodePort}"
 
     if [ -z ${configuredNodePort} ]; then
       kubectl describe domain $DOMAIN_UID -n $NAMESPACE
-      trace "Either domain $DOMAIN_UID does not exist or asNodePort is not configured in domain $DOMAIN_UID. Skipping this verify"
+      trace "Either domain $DOMAIN_UID does not exist or no NodePort is not configured for the admin server in domain $DOMAIN_UID. Skipping this verify"
       return
     fi
 
@@ -1074,7 +1074,7 @@ function verify_admin_server_ext_service {
     fi
 
     if [ "$nodePort" -ne "$configuredNodePort" ]; then
-      fail "Configured asNodePort of ${configuredNodePort} is different from nodePort found in service ${ADMIN_SERVER_NODEPORT_SERVICE}: ${nodePort}"
+      fail "Configured NodePort of ${configuredNodePort} for the admin server is different from nodePort found in service ${ADMIN_SERVER_NODEPORT_SERVICE}: ${nodePort}"
     fi
 
     local TEST_REST_URL="http://${NODEPORT_HOST}:${nodePort}/management/weblogic/latest/serverRuntime"

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

@@ -658,7 +658,15 @@ public NextAction apply(Packet packet) {
 
       packet.put(ProcessingConstants.SERVER_NAME, spec.getAsName());
       packet.put(ProcessingConstants.PORT, spec.getAsPort());
-      packet.put(ProcessingConstants.NODE_PORT, spec.getAsNodePort());
+      List<ServerStartup> ssl = spec.getServerStartup();
+      if (ssl != null) {
+        for (ServerStartup ss : ssl) {
+          if (ss.getServerName().equals(spec.getAsName())) {
+            packet.put(ProcessingConstants.NODE_PORT, ss.getNodePort());
+            break;
+          }
+        }
+      }
       return doNext(packet);
     }
   }
@@ -1004,9 +1012,6 @@ public NextAction apply(Packet packet) {
         if (serverStartup != null) {
           nodePort = serverStartup.getNodePort();
         }
-        if (nodePort == null && serverName.equals(spec.getAsName())) {
-          nodePort = spec.getAsNodePort();
-        }
 
         p.put(ProcessingConstants.SERVER_NAME, serverName);
         if (ssi.clusterConfig != null) {

swagger/domain.json

@@ -1520,10 +1520,6 @@
       "description": "Administration server port.  Note: Possibly temporary as we could find this value through domain home inspection.",
       "type": "integer"
      },
-     "asNodePort": {
-      "description": "Administration server NodePort port.  The port on each node on which the administration server will be exposed.  If specified, this value must be an unused port.  By default, the administration server will not be exposed outside the Kubernetes cluster.",
-      "type": "integer"
-     },
      "asEnv": {
       "description": "Environment variables for use in starting the administration server.",
       "type": "array",
@@ -1631,4 +1627,4 @@
     "BearerToken": []
    }
   ]
- }
+ }