Roll services using recipe hash

Author: russgold

docs/domains/Domain.json

@@ -51,6 +51,14 @@
           "items": {
             "$ref": "#/definitions/Channel"
           }
+        },
+        "annotations": {
+          "description": "Annotations to associate with the external channel service",
+          "$ref": "#/definitions/Map"
+        },
+        "labels": {
+          "description": "Labels to associate with the external channel service",
+          "$ref": "#/definitions/Map"
         }
       }
     },

docs/domains/Domain.md

@@ -144,7 +144,9 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 
 | Name | Type | Description |
 | --- | --- | --- |
+| annotations | Map | Annotations to associate with the external channel service |
 | channels | array of [Channel](#channel) | Specifies which of the admin server's WebLogic channels should be exposed outside the Kubernetes cluster via a node port service, along with the node port for each channel. If not specified, the admin server's node port service will not be created. |
+| labels | Map | Labels to associate with the external channel service |
 
 ### Probe Tuning
 

docs/domains/index.html

@@ -971,6 +971,14 @@
           "items": {
             "$ref": "#/definitions/Channel"
           }
+        },
+        "annotations": {
+          "description": "Annotations to associate with the external channel service",
+          "$ref": "#/definitions/Map"
+        },
+        "labels": {
+          "description": "Labels to associate with the external channel service",
+          "$ref": "#/definitions/Map"
         }
       }
     },

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

@@ -10,7 +10,7 @@
 
 /** An interface for an object to configure a cluster in a test. */
 @SuppressWarnings("UnusedReturnValue")
-public interface ClusterConfigurator {
+public interface ClusterConfigurator extends ServiceConfigurator {
   ClusterConfigurator withReplicas(int replicas);
 
   ClusterConfigurator withMaxUnavailable(int maxUnavailable);

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

@@ -5,7 +5,7 @@
 package oracle.kubernetes.weblogic.domain;
 
 import java.util.List;
-import oracle.kubernetes.weblogic.domain.model.Channel;
+import oracle.kubernetes.weblogic.domain.model.AdminServerSpec;
 import oracle.kubernetes.weblogic.domain.model.ClusterSpec;
 import oracle.kubernetes.weblogic.domain.model.ServerSpec;
 
@@ -15,7 +15,7 @@
  */
 public interface EffectiveConfigurationFactory {
 
-  ServerSpec getAdminServerSpec();
+  AdminServerSpec getAdminServerSpec();
 
   ServerSpec getServerSpec(String serverName, String clusterName);
 
@@ -30,8 +30,4 @@ public interface EffectiveConfigurationFactory {
   boolean isShuttingDown();
 
   List<String> getAdminServerChannelNames();
-
-  List<Channel> getAdminServerChannels();
-
-  Integer getDefaultReplicaLimit();
 }

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

@@ -10,7 +10,7 @@
 
 /** An interface for an object to configure a server in a test. */
 @SuppressWarnings("UnusedReturnValue")
-public interface ServerConfigurator {
+public interface ServerConfigurator extends ServiceConfigurator {
   ServerConfigurator withDesiredState(String desiredState);
 
   ServerConfigurator withEnvironmentVariable(String name, String value);

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

@@ -0,0 +1,12 @@
+// Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.weblogic.domain;
+
+@SuppressWarnings("UnusedReturnValue")
+public interface ServiceConfigurator {
+  ServiceConfigurator withServiceLabel(String name, String value);
+
+  ServiceConfigurator withServiceAnnotation(String name, String value);
+}

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

@@ -63,23 +63,6 @@ public List<Channel> getChannels() {
     return adminService.getChannels();
   }
 
-  /**
-   * Gets channel.
-   *
-   * @param channelName Channel name
-   * @return Channel
-   */
-  public Channel getChannel(String channelName) {
-    if (adminService != null) {
-      for (Channel c : adminService.getChannels()) {
-        if (channelName.equals(c.getChannelName())) {
-          return c;
-        }
-      }
-    }
-    return null;
-  }
-
   @Override
   public String toString() {
     return new ToStringBuilder(this)
@@ -115,10 +98,7 @@ public int hashCode() {
   }
 
   public AdminService getAdminService() {
+    if (adminService == null) adminService = new AdminService();
     return adminService;
   }
-
-  public void setAdminService(AdminService adminService) {
-    this.adminService = adminService;
-  }
 }

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

@@ -0,0 +1,17 @@
+// Copyright 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.weblogic.domain.model;
+
+/** Represents the effective configuration for an admin server, as seen by the operator runtime. */
+public interface AdminServerSpec extends ServerSpec {
+
+  /**
+   * Returns the admin service configuration for the admin server, which controls the external
+   * channel service.
+   *
+   * @return the admin service configuration
+   */
+  AdminService getAdminService();
+}

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

@@ -1,11 +1,19 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.weblogic.domain.model;
 
-public class AdminServerSpecCommonImpl extends ServerSpecCommonImpl {
-  public AdminServerSpecCommonImpl(DomainSpec spec, AdminServer server) {
+public class AdminServerSpecCommonImpl extends ServerSpecCommonImpl implements AdminServerSpec {
+  private final AdminServer adminServer;
+
+  AdminServerSpecCommonImpl(DomainSpec spec, AdminServer server) {
     super(spec, server, null, null);
+    adminServer = server;
+  }
+
+  @Override
+  public AdminService getAdminService() {
+    return adminServer.getAdminService();
   }
 }