Merge pull request #617 from oracle/schema-fix4

Schema: use volumes and volumeMounts

Author: rjeberhard

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

@@ -135,12 +135,13 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "IF_NEEDED"
-  # an (optional) list of environment variable to be set on the servers
-  env:
-  - name: JAVA_OPTIONS
-    value: "-Dweblogic.StdoutDebugEnabled=false"
-  - name: USER_MEM_ARGS
-    value: "-Xms64m -Xmx256m "
+  serverPod:
+    # an (optional) list of environment variable to be set on the servers
+    env:
+    - name: JAVA_OPTIONS
+      value: "-Dweblogic.StdoutDebugEnabled=false"
+    - name: USER_MEM_ARGS
+      value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"

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

@@ -131,8 +131,6 @@ spec:
   # 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: domain1
-  # The WebLogic Domain Name
-  domainName: domain1
   # The WebLogic Domain Home
   domainHome: /shared/domains/domain1
   # If the domain home is in the image
@@ -148,10 +146,6 @@ spec:
   # how to create that Secret at the end of this file)
   webLogicCredentialsSecret:
     name: domain1-weblogic-credentials
-  # The name of the Admin Server
-  asName: "admin-server"
-  # The Admin Server's ListenPort
-  asPort: 7001
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: true
   # The in-pod name of the directory to store the domain, node manager, server logs, and server .out
@@ -165,12 +159,20 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "IF_NEEDED"
-  # an (optional) list of environment variable to be set on the servers
-  env:
-  - name: JAVA_OPTIONS
-    value: "-Dweblogic.StdoutDebugEnabled=false"
-  - name: USER_MEM_ARGS
-    value: "-Xms64m -Xmx256m "
+  serverPod:
+    # an (optional) list of environment variable to be set on the servers
+    env:
+    - name: JAVA_OPTIONS
+      value: "-Dweblogic.StdoutDebugEnabled=false"
+    - name: USER_MEM_ARGS
+      value: "-Xms64m -Xmx256m "
+    volumes:
+    - name: weblogic-domain-storage-volume
+      persistentVolumeClaim:
+        claimName: domain1-weblogic-sample-pvc
+    volumeMounts:
+    - mountPath: /shared
+      name: weblogic-domain-storage-volume
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
   # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -191,9 +193,6 @@ spec:
       replicas: 2
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
-  storage:
-    predefined:
-      claim: domain1-weblogic-sample-pvc
 ```
 
 ### Verify the domain

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

@@ -404,6 +404,7 @@ function createYamlFiles {
   sed -i -e "s:%LOG_HOME%:${logHome}:g" ${dcrOutput}
   sed -i -e "s:%INCLUDE_SERVER_OUT_IN_POD_LOG%:${includeServerOutInPodLog}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${dcrOutput}
+  sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${dcrOutput}
 
   # Remove any "...yaml-e" files left over from running sed
   rm -f ${domainOutputDir}/*.yaml-e

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

@@ -41,12 +41,20 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
-  # an (optional) list of environment variable to be set on the servers
-  env:
-  - name: JAVA_OPTIONS
-    value: "%JAVA_OPTIONS%"
-  - name: USER_MEM_ARGS
-    value: "-Xms64m -Xmx256m "
+  serverPod:
+    # an (optional) list of environment variable to be set on the server
+    env:
+    - name: JAVA_OPTIONS
+      value: "%JAVA_OPTIONS%"
+    - name: USER_MEM_ARGS
+      value: "-Xms64m -Xmx256m "
+    volumes:
+    - name: weblogic-domain-storage-volume
+      persistentVolumeClaim:
+        claimName: %DOMAIN_PVC_NAME%
+    volumeMounts:
+    - mountPath: %DOMAIN_ROOT_DIR%
+      name: weblogic-domain-storage-volume
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
     # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -65,6 +73,3 @@ spec:
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
-  storage:
-    predefined:
-      claim: %DOMAIN_PVC_NAME%

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

@@ -12,7 +12,6 @@
 import javax.annotation.Nonnull;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
-import oracle.kubernetes.weblogic.domain.v2.DomainStorage;
 
 /**
  * Configures a domain, adding settings independently of the version of the domain representation.
@@ -128,62 +127,6 @@ public DomainConfigurator withLogHomeEnabled(boolean logHomeEnabled) {
     return this;
   }
 
-  /**
-   * Configures the domain to use a persistent volume claim defined before the domain is created.
-   *
-   * @param claimName the name of the persistent volume claim
-   * @return this object
-   */
-  public DomainConfigurator withPredefinedClaim(String claimName) {
-    getDomainSpec().setStorage(DomainStorage.createPredefinedClaim(claimName));
-    return this;
-  }
-
-  /**
-   * Configures the domain to use storage in the local node.
-   *
-   * @param path the path to the storage
-   * @return this object
-   */
-  public DomainConfigurator withHostPathStorage(String path) {
-    getDomainSpec().setStorage(DomainStorage.createHostPathStorage(path));
-    return this;
-  }
-
-  /**
-   * Configures the domain to use storage on a remote server.
-   *
-   * @param server the server hosting the storage
-   * @param path the path to the storage
-   * @return this object
-   */
-  public DomainConfigurator withNfsStorage(String server, String path) {
-    getDomainSpec().setStorage(DomainStorage.createNfsStorage(server, path));
-    return this;
-  }
-
-  /**
-   * Defines the amount of storage to allocate for the domain.
-   *
-   * @param size the size to allocate
-   * @return this object
-   */
-  public DomainConfigurator withStorageSize(String size) {
-    getDomainSpec().getStorage().setStorageSize(size);
-    return this;
-  }
-
-  /**
-   * Defines the amount of storage to allocate for the domain.
-   *
-   * @param policy the size to allocate
-   * @return this object
-   */
-  public DomainConfigurator withStorageReclaimPolicy(String policy) {
-    getDomainSpec().getStorage().setStorageReclaimPolicy(policy);
-    return this;
-  }
-
   /**
    * Sets the WebLogic configuration overrides configmap name for the domain
    *

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

@@ -171,15 +171,15 @@ void setContainerSecurityContext(V1SecurityContext containerSecurityContext) {
     serverPod.setContainerSecurityContext(containerSecurityContext);
   }
 
-  List<V1Volume> getAdditionalVolumes() {
+  public List<V1Volume> getAdditionalVolumes() {
     return serverPod.getAdditionalVolumes();
   }
 
   void addAdditionalVolume(String name, String path) {
     serverPod.addAdditionalVolume(name, path);
   }
 
-  List<V1VolumeMount> getAdditionalVolumeMounts() {
+  public List<V1VolumeMount> getAdditionalVolumeMounts() {
     return serverPod.getAdditionalVolumeMounts();
   }
 

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

@@ -7,8 +7,6 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1ObjectMeta;
-import io.kubernetes.client.models.V1PersistentVolume;
-import io.kubernetes.client.models.V1PersistentVolumeClaim;
 import io.kubernetes.client.models.V1SecretReference;
 import java.util.List;
 import java.util.Map;
@@ -26,9 +24,6 @@
 /** 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";
 
@@ -353,42 +348,6 @@ public Map<String, String> getChannelServiceAnnotations(String channel) {
     return getEffectiveConfigurationFactory().getChannelServiceAnnotations(channel);
   }
 
-  /**
-   * Returns the name of the persistent volume claim for the logs and PV-based domain.
-   *
-   * @return volume claim
-   */
-  public String 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()));
-  }
-
-  /**
-   * Returns the persistent volume that must be created for domain storage. May be null.
-   *
-   * @return a definition of the kubernetes resource to create
-   */
-  public V1PersistentVolume getRequiredPersistentVolume() {
-    return spec.getStorage() == null
-        ? null
-        : spec.getStorage().getRequiredPersistentVolume(getDomainUID());
-  }
-
-  /**
-   * Returns the persistent volume claim that must be created for domain storage. May be null.
-   *
-   * @return a definition of the kubernetes resource to create
-   */
-  public V1PersistentVolumeClaim getRequiredPersistentVolumeClaim() {
-    return spec.getStorage() == null
-        ? null
-        : spec.getStorage().getRequiredPersistentVolumeClaim(getDomainUID(), getNamespace());
-  }
-
   /**
    * Returns the name of the Kubernetes configmap that contains optional configuration overrides.
    *
@@ -407,10 +366,6 @@ public List<String> getConfigOverrideSecrets() {
     return spec.getConfigOverrideSecrets();
   }
 
-  private String getNamespace() {
-    return getMetadata().getNamespace();
-  }
-
   @Override
   public String toString() {
     return new ToStringBuilder(this)

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

@@ -127,13 +127,6 @@ public class DomainSpec extends BaseConfiguration {
       "True if this domain's home is defined in the docker image for the domain. Defaults to true")
   private Boolean domainHomeInImage;
 
-  /** The definition of the storage used for this domain. */
-  @Description(
-      "The storage used for this domain. "
-          + "Defaults to a predefined claim for a PVC whose name is "
-          + "the domain UID followed by '-weblogic-domain-pvc'")
-  private DomainStorage storage;
-
   /**
    * The name of the Kubernetes configmap used for optional WebLogic configuration overrides.
    *
@@ -417,24 +410,6 @@ public DomainSpec withReplicas(Integer replicas) {
     return this;
   }
 
-  /**
-   * Specifies the storage for the domain.
-   *
-   * @param storage the definition of the domain storage.
-   */
-  public void setStorage(DomainStorage storage) {
-    this.storage = storage;
-  }
-
-  /**
-   * Returns the storage for the domain.
-   *
-   * @return the definition of the domain storage.
-   */
-  public DomainStorage getStorage() {
-    return storage;
-  }
-
   @Nullable
   String getConfigOverrides() {
     return configOverrides;
@@ -480,7 +455,6 @@ public String toString() {
             .append("webLogicCredentialsSecret", webLogicCredentialsSecret)
             .append("image", image)
             .append("imagePullPolicy", imagePullPolicy)
-            .append("storage", storage)
             .append("imagePullSecrets", imagePullSecrets)
             .append("adminServer", adminServer)
             .append("managedServers", managedServers)
@@ -506,7 +480,6 @@ public int hashCode() {
             .append(webLogicCredentialsSecret)
             .append(image)
             .append(imagePullPolicy)
-            .append(storage)
             .append(imagePullSecrets)
             .append(adminServer)
             .append(managedServers)
@@ -535,7 +508,6 @@ public boolean equals(Object other) {
             .append(domainHomeInImage, rhs.domainHomeInImage)
             .append(webLogicCredentialsSecret, rhs.webLogicCredentialsSecret)
             .append(image, rhs.image)
-            .append(storage, rhs.storage)
             .append(imagePullPolicy, rhs.imagePullPolicy)
             .append(imagePullSecrets, rhs.imagePullSecrets)
             .append(adminServer, rhs.adminServer)