Merge pull request #603 from oracle/schema-fix3

Use lists for clusters and managedServers so that JSON schema is clearer

Author: rjeberhard

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

@@ -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/domain-template.yaml

@@ -61,7 +61,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/DomainSpec.java

@@ -164,15 +164,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
@@ -181,7 +181,7 @@ public class DomainSpec extends BaseConfiguration {
    * @return
    */
   public DomainSpec withCluster(Cluster cluster) {
-    clusters.put(cluster.getClusterName(), cluster);
+    clusters.add(cluster);
     return this;
   }
 
@@ -551,12 +551,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) {
@@ -585,11 +595,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;
   }
 
@@ -603,7 +613,7 @@ public ServerSpec getAdminServerSpec() {
     public ServerSpec getServerSpec(String serverName, String clusterName) {
       return new ManagedServerSpecV2Impl(
           DomainSpec.this,
-          getServer(serverName),
+          getManagedServer(serverName),
           getCluster(clusterName),
           getClusterLimit(clusterName));
     }
@@ -669,7 +679,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/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml

@@ -11,13 +11,6 @@ spec:
   # Identify which Secret contains the WebLogic Admin credentials
   adminSecret:
     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

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

@@ -11,11 +11,6 @@ spec:
   # Identify which Secret contains the WebLogic Admin credentials
   adminSecret:
     name: admin-secret
-  # The name of the Admin Server
-  asName: admin
-  # The Admin Server's ListenPort
-  asPort: 8001
-
   adminServer:
   # the T3 endpoints to export. Each entry is an endpoint name,
   # optionally with labels and annotations to be added to the generated external channel service.
@@ -38,8 +33,6 @@ spec:
         testKey3: testValue3
         longer: shorter
     restartVersion: "1"
-
-  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.

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

@@ -11,13 +11,6 @@ spec:
   # Identify which Secret contains the WebLogic Admin credentials
   adminSecret:
     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.
@@ -84,7 +77,7 @@ spec:
 
   # list of configurations per named server.
   managedServers:
-    server1:
+    - serverName: server1
       # an (optional) list of environment variable to be set on the server
       serverPod:
         env:
@@ -99,13 +92,13 @@ spec:
             memory: "32Mi"
           limits:
             memory: "256Mi"
-    server2:
+    - serverName: server2
       serverStartState: ADMIN
       restartVersion: "3"
 
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
-    cluster2:
+    - clusterName: cluster2
       desiredState: "RUNNING"
       replicas: 5
       serverPod:

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

@@ -11,7 +11,6 @@
 import io.kubernetes.client.models.V1PodList;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import oracle.kubernetes.operator.JobWatcher;
 import oracle.kubernetes.operator.LabelConstants;
 import oracle.kubernetes.operator.ProcessingConstants;
@@ -153,11 +152,11 @@ private static int runningServersCount(DomainPresenceInfo info) {
   private static boolean creatingServers(DomainPresenceInfo info) {
     Domain dom = info.getDomain();
     DomainSpec spec = dom.getSpec();
-    Map<String, Cluster> clusters = spec.getClusters();
-    Map<String, ManagedServer> servers = spec.getManagedServers();
+    List<Cluster> clusters = spec.getClusters();
+    List<ManagedServer> servers = spec.getManagedServers();
 
     // Are we starting a cluster?
-    for (Cluster cluster : clusters.values()) {
+    for (Cluster cluster : clusters) {
       int replicaCount = cluster.getReplicas();
       LOGGER.fine("creatingServers replicaCount: " + replicaCount + " for cluster: " + cluster);
       if (replicaCount > 0) {