Merge remote-tracking branch 'origin/develop' into schema-fix4

Author: rjeberhard

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

@@ -125,7 +125,7 @@ spec:
   imagePullPolicy: "Never"
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret:
+  webLogicCredentialsSecret:
     name: domain1-weblogic-credentials
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: true
@@ -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-in-image/domain-template.yaml

@@ -22,7 +22,7 @@ spec:
   imagePullPolicy: "Never"
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret: 
+  webLogicCredentialsSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
@@ -52,7 +52,7 @@ spec:
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
-    %CLUSTER_NAME%:
+    - clusterName: %CLUSTER_NAME%
       serverStartState: "RUNNING"
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start from clusters not listed in clusters

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
@@ -146,12 +144,8 @@ spec:
   #- name:
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret:
+  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/domain-template.yaml

@@ -26,7 +26,7 @@ spec:
   %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%- name: %WEBLOGIC_IMAGE_PULL_SECRET_NAME%
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
-  adminSecret: 
+  webLogicCredentialsSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
@@ -69,7 +69,7 @@ spec:
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
-    %CLUSTER_NAME%:
+    - clusterName: %CLUSTER_NAME%
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start for unlisted clusters
   # replicas: 1

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

@@ -284,12 +284,12 @@ public void setStatus(DomainStatus status) {
   }
 
   /**
-   * Reference to secret containing domain administrator username and password.
+   * Reference to secret containing WebLogic startup credentials username and password.
    *
-   * @return admin secret
+   * @return credentials secret
    */
-  public V1SecretReference getAdminSecret() {
-    return spec.getAdminSecret();
+  public V1SecretReference getWebLogicCredentialsSecret() {
+    return spec.getWebLogicCredentialsSecret();
   }
 
   /**

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

@@ -45,10 +45,10 @@ public class DomainSpec extends BaseConfiguration {
   private String domainHome;
 
   /**
-   * Reference to secret containing domain administrator username and password. Secret must contain
-   * keys names 'username' and 'password' (Required)
+   * Reference to secret containing WebLogic startup credentials username and password. Secret must
+   * contain keys names 'username' and 'password' (Required)
    */
-  @Valid @NotNull private V1SecretReference adminSecret;
+  @Valid @NotNull private V1SecretReference webLogicCredentialsSecret;
 
   /**
    * The in-pod name of the directory to store the domain, node manager, server logs, and server
@@ -157,15 +157,15 @@ public class DomainSpec extends BaseConfiguration {
    * @since 2.0
    */
   @Description("Configuration for the managed servers")
-  private Map<String, ManagedServer> managedServers = new HashMap<>();
+  private List<ManagedServer> managedServers = new ArrayList<>();
 
   /**
    * The configured clusters.
    *
    * @since 2.0
    */
   @Description("Configuration for the clusters")
-  protected Map<String, Cluster> clusters = new HashMap<>();
+  protected List<Cluster> clusters = new ArrayList<>();
 
   /**
    * Adds a Cluster to the DomainSpec
@@ -174,7 +174,7 @@ public class DomainSpec extends BaseConfiguration {
    * @return
    */
   public DomainSpec withCluster(Cluster cluster) {
-    clusters.put(cluster.getClusterName(), cluster);
+    clusters.add(cluster);
     return this;
   }
 
@@ -257,24 +257,24 @@ public DomainSpec withImage(String image) {
     return this;
   }
 
-  public V1SecretReference getAdminSecret() {
-    return adminSecret;
+  public V1SecretReference getWebLogicCredentialsSecret() {
+    return webLogicCredentialsSecret;
   }
 
   @SuppressWarnings("unused")
-  public void setAdminSecret(V1SecretReference adminSecret) {
-    this.adminSecret = adminSecret;
+  public void setWebLogicCredentialsSecret(V1SecretReference webLogicCredentialsSecret) {
+    this.webLogicCredentialsSecret = webLogicCredentialsSecret;
   }
 
   /**
-   * Reference to secret containing domain administrator username and password. Secret must contain
-   * keys names 'username' and 'password' (Required)
+   * Reference to secret containing WebLogic startup credentials username and password. Secret must
+   * contain keys names 'username' and 'password' (Required)
    *
-   * @param adminSecret admin secret
+   * @param webLogicCredentialsSecret WebLogic startup credentials secret
    * @return this
    */
-  public DomainSpec withAdminSecret(V1SecretReference adminSecret) {
-    this.adminSecret = adminSecret;
+  public DomainSpec withWebLogicCredentialsSecret(V1SecretReference webLogicCredentialsSecret) {
+    this.webLogicCredentialsSecret = webLogicCredentialsSecret;
     return this;
   }
 
@@ -452,7 +452,7 @@ public String toString() {
             .append("domainUID", domainUID)
             .append("domainHome", domainHome)
             .append("domainHomeInImage", domainHomeInImage)
-            .append("adminSecret", adminSecret)
+            .append("webLogicCredentialsSecret", webLogicCredentialsSecret)
             .append("image", image)
             .append("imagePullPolicy", imagePullPolicy)
             .append("imagePullSecrets", imagePullSecrets)
@@ -477,7 +477,7 @@ public int hashCode() {
             .append(domainUID)
             .append(domainHome)
             .append(domainHomeInImage)
-            .append(adminSecret)
+            .append(webLogicCredentialsSecret)
             .append(image)
             .append(imagePullPolicy)
             .append(imagePullSecrets)
@@ -506,7 +506,7 @@ public boolean equals(Object other) {
             .append(domainUID, rhs.domainUID)
             .append(domainHome, rhs.domainHome)
             .append(domainHomeInImage, rhs.domainHomeInImage)
-            .append(adminSecret, rhs.adminSecret)
+            .append(webLogicCredentialsSecret, rhs.webLogicCredentialsSecret)
             .append(image, rhs.image)
             .append(imagePullPolicy, rhs.imagePullPolicy)
             .append(imagePullSecrets, rhs.imagePullSecrets)
@@ -523,12 +523,22 @@ public boolean equals(Object other) {
     return builder.isEquals();
   }
 
-  private Server getServer(String serverName) {
-    return managedServers.get(serverName);
+  ManagedServer getManagedServer(String serverName) {
+    if (serverName != null) {
+      for (ManagedServer s : managedServers) {
+        if (serverName.equals(s.getServerName())) return s;
+      }
+    }
+    return null;
   }
 
-  private Cluster getCluster(String clusterName) {
-    return clusters.get(clusterName);
+  Cluster getCluster(String clusterName) {
+    if (clusterName != null) {
+      for (Cluster c : clusters) {
+        if (clusterName.equals(c.getClusterName())) return c;
+      }
+    }
+    return null;
   }
 
   private int getReplicaCountFor(Cluster cluster) {
@@ -557,11 +567,11 @@ private void setAdminServer(AdminServer adminServer) {
     this.adminServer = adminServer;
   }
 
-  public Map<String, ManagedServer> getManagedServers() {
+  public List<ManagedServer> getManagedServers() {
     return managedServers;
   }
 
-  public Map<String, Cluster> getClusters() {
+  public List<Cluster> getClusters() {
     return clusters;
   }
 
@@ -575,7 +585,7 @@ public ServerSpec getAdminServerSpec() {
     public ServerSpec getServerSpec(String serverName, String clusterName) {
       return new ManagedServerSpecV2Impl(
           DomainSpec.this,
-          getServer(serverName),
+          getManagedServer(serverName),
           getCluster(clusterName),
           getClusterLimit(clusterName));
     }
@@ -641,7 +651,7 @@ private Cluster getOrCreateCluster(String clusterName) {
 
     private Cluster createClusterWithName(String clusterName) {
       Cluster cluster = new Cluster().withClusterName(clusterName);
-      clusters.put(clusterName, cluster);
+      clusters.add(cluster);
       return cluster;
     }
   }

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

@@ -166,9 +166,8 @@ public ServerConfigurator configureServer(@Nonnull String serverName) {
   }
 
   private Server getOrCreateManagedServer(@Nonnull String serverName) {
-    ManagedServer server = getDomainSpec().getManagedServers().get(serverName);
+    ManagedServer server = getDomainSpec().getManagedServer(serverName);
     if (server != null) {
-      server.setServerName(serverName);
       return server;
     }
 
@@ -177,7 +176,7 @@ private Server getOrCreateManagedServer(@Nonnull String serverName) {
 
   private Server createManagedServer(String serverName) {
     ManagedServer server = new ManagedServer().withServerName(serverName);
-    getDomainSpec().getManagedServers().put(serverName, server);
+    getDomainSpec().getManagedServers().add(server);
     return server;
   }
 
@@ -342,9 +341,8 @@ public ClusterConfigurator configureCluster(@Nonnull String clusterName) {
   }
 
   private Cluster getOrCreateCluster(@Nonnull String clusterName) {
-    Cluster cluster = getDomainSpec().getClusters().get(clusterName);
+    Cluster cluster = getDomainSpec().getCluster(clusterName);
     if (cluster != null) {
-      cluster.setClusterName(clusterName);
       return cluster;
     }
 
@@ -353,7 +351,7 @@ private Cluster getOrCreateCluster(@Nonnull String clusterName) {
 
   private Cluster createCluster(@Nonnull String clusterName) {
     Cluster cluster = new Cluster().withClusterName(clusterName);
-    getDomainSpec().getClusters().put(clusterName, cluster);
+    getDomainSpec().getClusters().add(cluster);
     return cluster;
   }
 

model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java

@@ -51,7 +51,7 @@ public abstract class DomainTestBase {
   protected static Domain createDomain() {
     return new Domain()
         .withMetadata(new V1ObjectMeta().namespace(NS))
-        .withSpec(new DomainSpec().withAdminSecret(SECRET).withDomainUID(DOMAIN_UID));
+        .withSpec(new DomainSpec().withWebLogicCredentialsSecret(SECRET).withDomainUID(DOMAIN_UID));
   }
 
   protected abstract DomainConfigurator configureDomain(Domain domain);
@@ -66,7 +66,7 @@ protected static String getNamespace() {
 
   @Test
   public void canGetAdminServerInfoFromDomain() {
-    assertThat(domain.getAdminSecret(), equalTo(SECRET));
+    assertThat(domain.getWebLogicCredentialsSecret(), equalTo(SECRET));
   }
 
   @Test

model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml

@@ -9,15 +9,8 @@ metadata:
   namespace: domain_ns
 spec:
   # Identify which Secret contains the WebLogic Admin credentials
-  adminSecret:
+  webLogicCredentialsSecret:
     name: admin-secret
-  # The name of the Admin Server
-  asName: admin
-  # The Admin Server's ListenPort
-  asPort: 8001
-  # The WebLogic Domain Name
-
-  domainName: base_domain
   # 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.
@@ -68,7 +61,7 @@ spec:
         path: /other/path
 
   clusters:
-    cluster1:
+    - clusterName: cluster1
       serverPod:
         readinessProbe:
           initialDelaySeconds: 10
@@ -107,7 +100,7 @@ spec:
             user: weblogic
 
   managedServers:
-    server2:
+    - serverName: server2
       serverPod:
         livenessProbe:
           periodSeconds: 18