Merge pull request #598 from oracle/schema-fix2

Remove schema elements for domainName, asName and asPort

Author: rjeberhard

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain.sh

@@ -285,11 +285,6 @@ function createFiles {
   echo Generating ${domainPropertiesOutput}
 
   cp ${domainPropertiesInput} ${domainPropertiesOutput}
-  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%MANAGED_SERVER_PORT%:${managedServerPort}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%MANAGED_SERVER_NAME_BASE%:${managedServerNameBase}:g" ${domainPropertiesOutput}
   sed -i -e "s:%CONFIGURED_MANAGED_SERVER_COUNT%:${configuredManagedServerCount}:g" ${domainPropertiesOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${domainPropertiesOutput}
   sed -i -e "s:%PRODUCTION_MODE_ENABLED%:${productionModeEnabled}:g" ${domainPropertiesOutput}

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml

@@ -11,15 +11,7 @@ metadata:
   labels:
     weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
-    weblogic.domainName: %DOMAIN_NAME%
 spec:
-  # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
-  # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
-  # to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
-  # The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
-  domainUID: %DOMAIN_UID%
-  # The WebLogic Domain Name
-  domainName: %DOMAIN_NAME%
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
   # If the domain home is in the image
@@ -32,10 +24,6 @@ spec:
   # how to create that Secret at the end of this file)
   adminSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
-  # The name of the Admin Server
-  asName: "%ADMIN_SERVER_NAME%"
-  # The Admin Server's ListenPort
-  asPort: %ADMIN_PORT%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
   # serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
@@ -46,9 +34,9 @@ spec:
   serverStartPolicy: "%SERVER_START_POLICY%"
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
-  # serverStartState legal values are "RUNNING" or "ADMIN"
-  # "RUNNING" means the listed server will be started up to "RUNNING" mode
-  # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    # serverStartState legal values are "RUNNING" or "ADMIN"
+    # "RUNNING" means the listed server will be started up to "RUNNING" mode
+    # "ADMIN" means the listed server will be start up to "ADMIN" mode
     serverStartState: "RUNNING"
     # The Admin Server's NodePort
     %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%

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

@@ -390,13 +390,10 @@ function createYamlFiles {
   sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${dcrOutput}
-  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${dcrOutput}
-  sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
-  sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${dcrOutput}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml

@@ -12,15 +12,7 @@ metadata:
   labels:
     weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
-    weblogic.domainName: %DOMAIN_NAME%
 spec:
-  # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
-  # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
-  # to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
-  # The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
-  domainUID: %DOMAIN_UID%
-  # The WebLogic Domain Name
-  domainName: %DOMAIN_NAME%
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
   # If the domain home is in the image
@@ -36,10 +28,6 @@ spec:
   # how to create that Secret at the end of this file)
   adminSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
-  # The name of the Admin Server
-  asName: "%ADMIN_SERVER_NAME%"
-  # The Admin Server's ListenPort
-  asPort: %ADMIN_PORT%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
   # The in-pod name of the directory to store the domain, node manager, server logs, and server .out
@@ -61,9 +49,10 @@ spec:
     value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
-  # serverStartState legal values are "RUNNING" or "ADMIN"
-  # "RUNNING" means the listed server will be started up to "RUNNING" mode
-  # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    # serverStartState legal values are "RUNNING" or "ADMIN"
+    # "RUNNING" means the listed server will be started up to "RUNNING" mode
+    # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    serverStartState: "RUNNING"
     # The Admin Server's NodePort
     %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%
     # Uncomment to export the T3Channel as a service

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

@@ -9,8 +9,6 @@
 @SuppressWarnings("UnusedReturnValue")
 public interface AdminServerConfigurator extends ServerConfigurator {
 
-  AdminServerConfigurator withPort(int port);
-
   AdminServerConfigurator withNodePort(int nodePort);
 
   AdminServerConfigurator withExportedNetworkAccessPoints(String... names);

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

@@ -54,12 +54,8 @@ public DomainConfigurator withDomainHomeInImage(boolean domainHomeInImage) {
     return this;
   }
 
-  /**
-   * Defines a name for the domain's admin server.
-   *
-   * @param adminServerName the name of the admin server
-   */
-  public abstract AdminServerConfigurator configureAdminServer(String adminServerName);
+  /** Defines a name for the domain's admin server. */
+  public abstract AdminServerConfigurator configureAdminServer();
 
   public void withDefaultReplicaCount(int replicas) {
     getDomainSpec().setReplicas(replicas);
@@ -246,10 +242,6 @@ protected DomainSpec getDomainSpec() {
     return domain.getSpec();
   }
 
-  protected String getAsName() {
-    return domain.getAsName();
-  }
-
   public abstract DomainConfigurator withAdditionalVolume(String name, String path);
 
   public abstract DomainConfigurator withAdditionalVolumeMount(String name, String path);

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

@@ -12,6 +12,7 @@
 import io.kubernetes.client.models.V1SecretReference;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.validation.Valid;
 import oracle.kubernetes.json.Description;
@@ -25,6 +26,11 @@
 /** Domain represents a WebLogic domain and how it will be realized in the Kubernetes cluster. */
 @SuppressWarnings("deprecation")
 public class Domain {
+  /** The pattern for computing the default persistent volume claim name. */
+  private static final String PVC_NAME_PATTERN = "%s-weblogic-domain-pvc";
+
+  /** The pattern for computing the default shared logs directory. */
+  private static final String LOG_HOME_DEFAULT_PATTERN = "/shared/logs/%s";
 
   /**
    * APIVersion defines the versioned schema of this representation of an object. Servers should
@@ -271,44 +277,18 @@ public V1SecretReference getAdminSecret() {
     return spec.getAdminSecret();
   }
 
-  /**
-   * Returns the name of the admin server.
-   *
-   * @return admin server name
-   */
-  public String getAsName() {
-    return spec.getAsName();
-  }
-
-  /**
-   * Returns the port used by the admin server.
-   *
-   * @return admin server port
-   */
-  public Integer getAsPort() {
-    return spec.getAsPort();
-  }
-
   /**
    * Returns the domain unique identifier.
    *
    * @return domain UID
    */
   public String getDomainUID() {
-    return spec.getDomainUID();
-  }
-
-  /**
-   * Returns the domain name
-   *
-   * @return domain name
-   */
-  public String getDomainName() {
-    return spec.getDomainName();
+    return Optional.ofNullable(spec.getDomainUID()).orElse(getMetadata().getName());
   }
 
   public String getLogHome() {
-    return spec.getLogHome();
+    return Optional.ofNullable(spec.getLogHome())
+        .orElse(String.format(LOG_HOME_DEFAULT_PATTERN, getDomainUID()));
   }
 
   public boolean isIncludeServerOutInPodLog() {
@@ -359,7 +339,12 @@ public Map<String, String> getChannelServiceAnnotations(String channel) {
    * @return volume claim
    */
   public String getPersistentVolumeClaimName() {
-    return spec.getPersistentVolumeClaimName();
+    return spec.getStorage() == null ? null : getConfiguredClaimName(spec.getStorage());
+  }
+
+  private String getConfiguredClaimName(@Nonnull DomainStorage storage) {
+    return Optional.ofNullable(storage.getPersistentVolumeClaimName())
+        .orElse(String.format(PVC_NAME_PATTERN, getDomainUID()));
   }
 
   /**