Admin to external channel suffix

Author: rjeberhard

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -131,8 +131,8 @@ public void verifyServicesCreated() throws Exception {
               + domainUid
               + "-"
               + adminServerName
-              + "-admin) is created");
-      TestUtils.checkServiceCreated(domainUid + "-" + adminServerName + "-admin", domainNS);
+              + "-external) is created");
+      TestUtils.checkServiceCreated(domainUid + "-" + adminServerName + "-external", domainNS);
     }
     if (domainMap.get("serverStartPolicy") == null
         || (domainMap.get("serverStartPolicy") != null

integration-tests/src/test/java/oracle/kubernetes/operator/utils/K8sTestUtils.java

@@ -163,7 +163,7 @@ public void verifyServices(String labelSelectors, int expected) throws Exception
             null,
             Boolean.FALSE);
     /**
-     * TODO verify name pattern {domainUID}-admin-server {domainUID}-admin-server-admin
+     * TODO verify name pattern {domainUID}-admin-server {domainUID}-admin-server-external
      * {domainUID}-cluster-cluster-1 {domainUID}-managed-server1 {domainUID}-managed-server2
      */
     assertEquals("Number of services", v1ServiceList.getItems().size(), expected);

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

@@ -346,8 +346,8 @@ Here is an example of the output of this command:
 ```
 $ kubectl get services
 NAME                                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)           AGE
-domain1-admin-server                        NodePort    10.96.206.134    <none>        7001:30701/TCP    23m
-domain1-admin-server-admin                  NodePort    10.107.164.241   <none>        30012:30012/TCP   22m
+domain1-admin-server                        ClusterIP   10.96.206.134    <none>        7001/TCP          23m
+domain1-admin-server-external               NodePort    10.107.164.241   <none>        30012:30012/TCP   22m
 domain1-cluster-cluster-1                   ClusterIP   10.109.133.168   <none>        8001/TCP          22m
 domain1-managed-server1                     ClusterIP   None             <none>        8001/TCP          22m
 domain1-managed-server2                     ClusterIP   None             <none>        8001/TCP          22m

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

@@ -1013,7 +1013,7 @@ private static Step[] bringAdminServerUpSteps(DomainPresenceInfo info, Step next
     AdminService adminService = adminServer != null ? adminServer.getAdminService() : null;
     List<Channel> channels = adminService != null ? adminService.getChannels() : null;
     if (channels != null && !channels.isEmpty()) {
-      resources.add(ServiceHelper.createForAdminServiceStep(null));
+      resources.add(ServiceHelper.createForExternalServiceStep(null));
     }
 
     resources.add(ServiceHelper.createForServerStep(null));

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

@@ -10,7 +10,7 @@ public class LegalNames {
   private static final String SERVER_PATTERN = "%s-%s";
   private static final String CLUSTER_SERVICE_PATTERN = "%s-cluster-%s";
   private static final String DOMAIN_INTROSPECTOR_JOB_PATTERN = "%s-introspect-domain-job";
-  private static final String ADMIN_SERVICE_PATTERN = "%s-%s-admin";
+  private static final String EXTERNAL_SERVICE_PATTERN = "%s-%s-external";
 
   public static String toServerServiceName(String domainUID, String serverName) {
     return toServerName(domainUID, serverName);
@@ -32,8 +32,8 @@ 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));
+  static String toExternalServiceName(String domainUID, String serverName) {
+    return toDNS1123LegalName(String.format(EXTERNAL_SERVICE_PATTERN, domainUID, serverName));
   }
   /**
    * Converts value to nearest DNS-1123 legal name, which can be used as a Kubernetes identifier

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

@@ -767,35 +767,35 @@ private static boolean validateCurrentService(V1Service build, V1Service current
   }
 
   /**
-   * Create asynchronous step for admin service
+   * Create asynchronous step for external, NodePort service
    *
    * @param next Next processing step
-   * @return Step for creating admin service
+   * @return Step for creating external service
    */
-  public static Step createForAdminServiceStep(Step next) {
-    return new ForAdminServiceStep(next);
+  public static Step createForExternalServiceStep(Step next) {
+    return new ForExternalServiceStep(next);
   }
 
-  private static class ForAdminServiceStep extends ServiceHelperStep {
-    ForAdminServiceStep(Step next) {
+  private static class ForExternalServiceStep extends ServiceHelperStep {
+    ForExternalServiceStep(Step next) {
       super(next);
     }
 
     @Override
     protected ServiceStepContext createContext(Packet packet) {
-      return new ForAdminServiceStepContext(this, packet);
+      return new ForExternalServiceStepContext(this, packet);
     }
   }
 
-  private static class ForAdminServiceStepContext extends ServerServiceStepContext {
+  private static class ForExternalServiceStepContext extends ServerServiceStepContext {
 
-    ForAdminServiceStepContext(Step conflictStep, Packet packet) {
+    ForExternalServiceStepContext(Step conflictStep, Packet packet) {
       super(conflictStep, packet);
     }
 
     @Override
     protected String createServiceName() {
-      return LegalNames.toAdminServiceName(getDomainUID(), getServerName());
+      return LegalNames.toExternalServiceName(getDomainUID(), getServerName());
     }
 
     @Override

operator/src/main/resources/scripts/introspectDomain.py

@@ -488,7 +488,7 @@ def validateDynamicClusterDynamicServersDoNotUseCalculatedListenPorts(self, clus
       self.addError("The dynamic cluster " + self.name(cluster) + "'s dynamic servers use calculated listen ports.")
 
   def validateServerCustomChannelName(self):
-    reservedNames = ['default','defaultSecure','defaultAdmin']
+    reservedNames = ['default','default-secure','default-admin']
     for server in self.env.getDomain().getServers():
       naps = server.getNetworkAccessPoints()
       for nap in naps:

site/wlst.md

@@ -1,15 +1,15 @@
 # Using WLST
 
-You can use the WebLogic Scripting Tool (WLST) to manage a domain running in Kubernetes.  If the domain was configured to expose a T3 channel using the `exposeAdminT3Channel` setting when creating the domain, then the matching T3 service can be used to connect.  For example, if the `domainUID` is `domain1`, and the Administration Server name is `admin-server`, then the service would be called:
+You can use the WebLogic Scripting Tool (WLST) to manage a domain running in Kubernetes.  If the administration server was configured to expose a T3 channel using the `exposeAdminT3Channel` setting when creating the domain, then the matching T3 service can be used to connect.  For example, if the `domainUID` is `domain1`, and the Administration Server name is `admin-server`, then the service would be called:
 
 ```
-domain1-admin-server-admin  
+domain1-admin-server-external  
 ```
 
 This service will be in the same namespace as the domain.  The external port number can be obtained by checking this service’s `nodePort`:
 
 ```
-$ kubectl get service domain1-admin-server-admin -n domain1 -o jsonpath='{.spec.ports[0].nodePort}'
+$ kubectl get service domain1-admin-server-external -n domain1 -o jsonpath='{.spec.ports[0].nodePort}'
 30012
 ```