Add clusterService

Author: rjeberhard

docs/domains/Domain.json

@@ -14,7 +14,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverPod": {
@@ -84,7 +84,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "maxUnavailable": {
@@ -106,6 +106,7 @@
           "$ref": "#/definitions/ServerPod"
         },
         "clusterService": {
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic cluster.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverStartPolicy": {
@@ -232,7 +233,7 @@
           "type": "string"
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "domainHome": {
@@ -334,7 +335,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverPod": {

docs/domains/index.html

@@ -934,7 +934,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverPod": {
@@ -1004,7 +1004,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "maxUnavailable": {
@@ -1026,6 +1026,7 @@
           "$ref": "#/definitions/ServerPod"
         },
         "clusterService": {
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic cluster.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverStartPolicy": {
@@ -1152,7 +1153,7 @@
           "type": "string"
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "domainHome": {
@@ -1254,7 +1255,7 @@
           ]
         },
         "serverService": {
-          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic channels.",
+          "description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
           "$ref": "#/definitions/KubernetesResource"
         },
         "serverPod": {

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

@@ -29,7 +29,8 @@ public abstract class BaseConfiguration {
   @Description("Configuration affecting server pods")
   private ServerPod serverPod = new ServerPod();
 
-  @Description("Customization affecting ClusterIP Kubernetes services for WebLogic channels.")
+  @Description(
+      "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.")
   @SerializedName("serverService")
   @Expose
   private KubernetesResource serverService = new KubernetesResource();

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

@@ -4,6 +4,9 @@
 
 package oracle.kubernetes.weblogic.domain.v2;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import oracle.kubernetes.json.Description;
@@ -48,8 +51,10 @@ public class Cluster extends BaseConfiguration implements Comparable<Cluster> {
   @Range(minimum = 1)
   private Integer maxUnavailable;
 
-  // FIXME
-  private KubernetesResource clusterService;
+  @Description("Customization affecting ClusterIP Kubernetes services for WebLogic cluster.")
+  @SerializedName("clusterService")
+  @Expose
+  private KubernetesResource clusterService = new KubernetesResource();
 
   protected Cluster getConfiguration() {
     Cluster configuration = new Cluster();
@@ -90,6 +95,30 @@ public String getServerStartPolicy() {
     return serverStartPolicy;
   }
 
+  public void setClusterService(KubernetesResource clusterService) {
+    this.clusterService = clusterService;
+  }
+
+  public KubernetesResource getClusterService() {
+    return clusterService;
+  }
+
+  public Map<String, String> getClusterLabels() {
+    return clusterService.getLabels();
+  }
+
+  void addClusterLabel(String name, String value) {
+    clusterService.addLabel(name, value);
+  }
+
+  public Map<String, String> getClusterAnnotations() {
+    return clusterService.getAnnotations();
+  }
+
+  void addClusterAnnotation(String name, String value) {
+    clusterService.addAnnotations(name, value);
+  }
+
   Integer getMaxUnavailable() {
     return maxUnavailable;
   }
@@ -105,6 +134,7 @@ public String toString() {
         .append("clusterName", clusterName)
         .append("replicas", replicas)
         .append("serverStartPolicy", serverStartPolicy)
+        .append("clusterService", clusterService)
         .append("maxUnavailable", maxUnavailable)
         .toString();
   }
@@ -122,6 +152,7 @@ public boolean equals(Object o) {
         .append(clusterName, cluster.clusterName)
         .append(replicas, cluster.replicas)
         .append(serverStartPolicy, cluster.serverStartPolicy)
+        .append(clusterService, cluster.clusterService)
         .append(maxUnavailable, cluster.maxUnavailable)
         .isEquals();
   }
@@ -133,6 +164,7 @@ public int hashCode() {
         .append(clusterName)
         .append(replicas)
         .append(serverStartPolicy)
+        .append(clusterService)
         .append(maxUnavailable)
         .toHashCode();
   }

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

@@ -9,18 +9,34 @@
 
 public abstract class ClusterSpec {
   /**
-   * Returns the labels applied to the service.
+   * Returns the labels applied to server instance services.
    *
    * @return a map of labels
    */
   @Nonnull
   public abstract Map<String, String> getServiceLabels();
 
   /**
-   * Returns the annotations applied to the service.
+   * Returns the annotations applied to service instance services.
    *
    * @return a map of annotations
    */
   @Nonnull
   public abstract Map<String, String> getServiceAnnotations();
+
+  /**
+   * Returns the labels applied to the cluster service.
+   *
+   * @return a map of labels
+   */
+  @Nonnull
+  public abstract Map<String, String> getClusterLabels();
+
+  /**
+   * Returns the annotations applied to the cluster service.
+   *
+   * @return a map of annotations
+   */
+  @Nonnull
+  public abstract Map<String, String> getClusterAnnotations();
 }

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

@@ -27,4 +27,14 @@ public Map<String, String> getServiceLabels() {
   public Map<String, String> getServiceAnnotations() {
     return cluster.getServiceAnnotations();
   }
+
+  @Override
+  public Map<String, String> getClusterLabels() {
+    return cluster.getClusterLabels();
+  }
+
+  @Override
+  public Map<String, String> getClusterAnnotations() {
+    return cluster.getClusterAnnotations();
+  }
 }

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

@@ -719,12 +719,12 @@ ClusterSpec getClusterSpec() {
 
     @Override
     Map<String, String> getServiceLabels() {
-      return getClusterSpec().getServiceLabels();
+      return getClusterSpec().getClusterLabels();
     }
 
     @Override
     Map<String, String> getServiceAnnotations() {
-      return getClusterSpec().getServiceAnnotations();
+      return getClusterSpec().getClusterAnnotations();
     }
   }