Merge pull request #585 from oracle/develop-feature-rolling-restart

rjeberhard · web-flow · commit 54fd13268c5d · 2018-12-07T20:55:29.000-05:00
Develop feature rolling restart
diff --git a/model/src/main/java/oracle/kubernetes/operator/LabelConstants.java b/model/src/main/java/oracle/kubernetes/operator/LabelConstants.java
@@ -17,6 +17,9 @@ public interface LabelConstants {
   String OPERATORNAME_LABEL = "weblogic.operatorName";
   String JOBNAME_LABEL = "job-name";
   String APP_LABEL = "app";
+  String DOMAINRESTARTVERSION_LABEL = "weblogic.domainRestartVersion";
+  String CLUSTERRESTARTVERSION_LABEL = "weblogic.clusterRestartVersion";
+  String SERVERRESTARTVERSION_LABEL = "weblogic.serverRestartVersion";
 
   static String forDomainUid(String uid) {
     return String.format("%s=%s", DOMAINUID_LABEL, uid);
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java
@@ -47,4 +47,6 @@ ClusterConfigurator withLivenessProbeSettings(
   ClusterConfigurator withServiceLabel(String name, String value);
 
   ClusterConfigurator withServiceAnnotation(String name, String value);
+
+  ClusterConfigurator withRestartVersion(String restartVersion);
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java
@@ -330,4 +330,12 @@ public abstract DomainConfigurator withContainerSecurityContext(
    */
   public abstract DomainConfigurator withPodSecurityContext(
       V1PodSecurityContext podSecurityContext);
+
+  /**
+   * Set the restart version for the Domain
+   *
+   * @param restartVersion
+   * @return this object
+   */
+  public abstract DomainConfigurator withRestartVersion(String restartVersion);
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java
@@ -45,4 +45,6 @@ ServerConfigurator withReadinessProbeSettings(
   ServerConfigurator withServiceLabel(String name, String value);
 
   ServerConfigurator withServiceAnnotation(String name, String value);
+
+  ServerConfigurator withRestartVersion(String restartVersion);
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/AdminServerSpecV2Impl.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/AdminServerSpecV2Impl.java
@@ -6,6 +6,6 @@
 
 public class AdminServerSpecV2Impl extends ServerSpecV2Impl {
   public AdminServerSpecV2Impl(DomainSpec spec, AdminServer server) {
-    super(spec, server, null, spec);
+    super(spec, server, null, null);
   }
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java
@@ -48,6 +48,20 @@ public abstract class BaseConfiguration {
           + "Legal values are ADMIN_ONLY, NEVER, ALWAYS, or IF_NEEDED.")
   private String serverStartPolicy;
 
+  /**
+   * Tells the operator whether the customer wants to restart the server pods. The value can be any
+   * String and it can be defined on domain, cluster or server to restart the different pods. After
+   * the value is added, the corresponding pods will be terminated and created again. If customer
+   * modifies the value again after the pods were recreated, then the pods will again be terminated
+   * and recreated.
+   *
+   * @since 2.0
+   */
+  @Description(
+      "If preseent, every time this value is updated the operator will restart"
+          + " the required servers")
+  private String restartVersion;
+
   /**
    * Fills in any undefined settings in this configuration from another configuration.
    *
@@ -205,12 +219,21 @@ void addServiceAnnotations(String name, String value) {
     serverPod.addServiceAnnotations(name, value);
   }
 
+  public String getRestartVersion() {
+    return restartVersion;
+  }
+
+  public void setRestartVersion(String restartVersion) {
+    this.restartVersion = restartVersion;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)
         .append("serverStartState", serverStartState)
         .append("serverStartPolicy", serverStartPolicy)
         .append("serverPod", serverPod)
+        .append("restartVersion", restartVersion)
         .toString();
   }
 
@@ -226,6 +249,7 @@ public boolean equals(Object o) {
         .append(serverPod, that.serverPod)
         .append(serverStartState, that.serverStartState)
         .append(serverStartPolicy, that.serverStartPolicy)
+        .append(restartVersion, that.restartVersion)
         .isEquals();
   }
 
@@ -235,6 +259,7 @@ public int hashCode() {
         .append(serverPod)
         .append(serverStartState)
         .append(serverStartPolicy)
+        .append(restartVersion)
         .toHashCode();
   }
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java
@@ -706,9 +706,8 @@ public ServerSpec getServerSpec(String serverName, String clusterName) {
       return new ManagedServerSpecV2Impl(
           DomainSpec.this,
           getServer(serverName),
-          getClusterLimit(clusterName),
           getCluster(clusterName),
-          DomainSpec.this);
+          getClusterLimit(clusterName));
     }
 
     private Integer getClusterLimit(String clusterName) {
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java
@@ -218,6 +218,12 @@ public DomainConfigurator withPodSecurityContext(V1PodSecurityContext podSecurit
     return this;
   }
 
+  @Override
+  public DomainConfigurator withRestartVersion(String restartVersion) {
+    ((BaseConfiguration) getDomainSpec()).setRestartVersion(restartVersion);
+    return this;
+  }
+
   class ServerConfiguratorImpl implements ServerConfigurator {
     private Server server;
 
@@ -328,6 +334,12 @@ public ServerConfigurator withServiceAnnotation(String name, String value) {
       server.addServiceAnnotations(name, value);
       return this;
     }
+
+    @Override
+    public ServerConfigurator withRestartVersion(String restartVersion) {
+      server.setRestartVersion(restartVersion);
+      return this;
+    }
   }
 
   @Override
@@ -472,5 +484,11 @@ public ClusterConfigurator withServiceAnnotation(String name, String value) {
       cluster.addServiceAnnotations(name, value);
       return this;
     }
+
+    @Override
+    public ClusterConfigurator withRestartVersion(String restartVersion) {
+      cluster.setRestartVersion(restartVersion);
+      return this;
+    }
   }
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ManagedServerSpecV2Impl.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ManagedServerSpecV2Impl.java
@@ -15,8 +15,8 @@ public class ManagedServerSpecV2Impl extends ServerSpecV2Impl {
    * @param configurations the additional configurations to search for values if the server lacks
    */
   public ManagedServerSpecV2Impl(
-      DomainSpec spec, Server server, Integer clusterLimit, BaseConfiguration... configurations) {
-    super(spec, server, clusterLimit, configurations);
+      DomainSpec spec, Server server, Cluster cluster, Integer clusterLimit) {
+    super(spec, server, cluster, clusterLimit);
   }
 
   @Override
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Server.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Server.java
@@ -20,6 +20,7 @@ protected Server getConfiguration() {
     Server configuration = new Server();
     configuration.fillInFrom(this);
     configuration.setNodePort(nodePort);
+    configuration.setRestartVersion(this.getRestartVersion());
     return configuration;
   }
 
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerSpec.java
@@ -222,6 +222,12 @@ public V1SecurityContext getContainerSecurityContext() {
     return null;
   }
 
+  public abstract String getDomainRestartVersion();
+
+  public abstract String getClusterRestartVersion();
+
+  public abstract String getServerRestartVersion();
+
   @Override
   public String toString() {
     return new ToStringBuilder(this).append("domainSpec", domainSpec).toString();
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerSpecV2Impl.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/v2/ServerSpecV2Impl.java
@@ -17,6 +17,7 @@
 /** The effective configuration for a server configured by the version 2 domain model. */
 public abstract class ServerSpecV2Impl extends ServerSpec {
   private final Server server;
+  private final Cluster cluster;
   private Integer clusterLimit;
 
   /**
@@ -28,12 +29,13 @@ public abstract class ServerSpecV2Impl extends ServerSpec {
    * @param configurations the additional configurations to search for values if the server lacks
    *     them
    */
-  ServerSpecV2Impl(
-      DomainSpec spec, Server server, Integer clusterLimit, BaseConfiguration... configurations) {
+  ServerSpecV2Impl(DomainSpec spec, Server server, Cluster cluster, Integer clusterLimit) {
     super(spec);
     this.server = getBaseConfiguration(server);
     this.clusterLimit = clusterLimit;
-    for (BaseConfiguration configuration : configurations) this.server.fillInFrom(configuration);
+    this.server.fillInFrom(cluster);
+    this.server.fillInFrom(spec);
+    this.cluster = cluster;
   }
 
   private Server getBaseConfiguration(Server server) {
@@ -146,12 +148,28 @@ public V1SecurityContext getContainerSecurityContext() {
     return server.getContainerSecurityContext();
   }
 
+  @Override
+  public String getDomainRestartVersion() {
+    return domainSpec.getRestartVersion();
+  }
+
+  @Override
+  public String getClusterRestartVersion() {
+    return cluster != null ? cluster.getRestartVersion() : null;
+  }
+
+  @Override
+  public String getServerRestartVersion() {
+    return server.getRestartVersion();
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)
         .appendSuper(super.toString())
         .append("server", server)
         .append("clusterLimit", clusterLimit)
+        .append("cluster", cluster)
         .toString();
   }
 
@@ -169,6 +187,7 @@ public boolean equals(Object o) {
         .appendSuper(super.equals(o))
         .append(server, that.server)
         .append(clusterLimit, that.clusterLimit)
+        .append(cluster, that.cluster)
         .isEquals();
   }
 
@@ -178,6 +197,7 @@ public int hashCode() {
         .appendSuper(super.hashCode())
         .append(server)
         .append(clusterLimit)
+        .append(cluster)
         .toHashCode();
   }
 }
diff --git a/model/src/test/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Test.java b/model/src/test/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Test.java
@@ -497,6 +497,35 @@ public void whenNodeSelectorConfiguredOnMultipleLevels_useCombination() {
     assertThat(serverSpec.getNodeSelectors(), hasEntry("key3", "server"));
   }
 
+  @Test
+  public void whenRestartVersionConfiguredOnMultipleLevels_useCombination() {
+    configureDomain(domain).withRestartVersion("1");
+    configureCluster(CLUSTER_NAME).withRestartVersion("2");
+    configureServer(SERVER1).withRestartVersion("3");
+    configureAdminServer().withRestartVersion("4");
+
+    ServerSpec clusteredServer = domain.getServer(SERVER1, CLUSTER_NAME);
+    ServerSpec nonClusteredServerWithRestartVersion = domain.getServer(SERVER1, null);
+    ServerSpec nonClusteredServerNoRestartVersion = domain.getServer("anyServer", null);
+    ServerSpec adminServer = domain.getAdminServerSpec();
+
+    assertThat(clusteredServer.getDomainRestartVersion(), is("1"));
+    assertThat(clusteredServer.getClusterRestartVersion(), is("2"));
+    assertThat(clusteredServer.getServerRestartVersion(), is("3"));
+
+    assertThat(nonClusteredServerWithRestartVersion.getDomainRestartVersion(), is("1"));
+    assertThat(nonClusteredServerWithRestartVersion.getClusterRestartVersion(), nullValue());
+    assertThat(nonClusteredServerWithRestartVersion.getServerRestartVersion(), is("3"));
+
+    assertThat(nonClusteredServerNoRestartVersion.getDomainRestartVersion(), is("1"));
+    assertThat(nonClusteredServerNoRestartVersion.getClusterRestartVersion(), nullValue());
+    assertThat(nonClusteredServerNoRestartVersion.getServerRestartVersion(), nullValue());
+
+    assertThat(adminServer.getDomainRestartVersion(), is("1"));
+    assertThat(adminServer.getClusterRestartVersion(), nullValue());
+    assertThat(adminServer.getServerRestartVersion(), is("4"));
+  }
+
   @Test
   public void whenResourceRequirementsConfiguredOnDomain() {
     configureDomainWithResourceRequirements(domain);
@@ -1167,6 +1196,53 @@ public void whenDomain3ReadFromYaml_adminServerHasAnnotationsAndLabels() throws
     assertThat(domain.getAdminServerSpec().getServiceLabels(), hasEntry("testKey2", "testValue2"));
   }
 
+  @Test
+  public void whenDomain3ReadFromYaml_AdminServerRestartVersion() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_3);
+    assertThat(domain.getAdminServerSpec().getServerRestartVersion(), is("1"));
+  }
+
+  @Test
+  public void whenDomain3ReadFromYaml_NoRestartVersion() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_3);
+    ServerSpec clusteredServer = domain.getServer("anyServer", "anyCluster");
+    ServerSpec nonClusteredServer = domain.getServer("anyServer", null);
+    assertThat(clusteredServer.getDomainRestartVersion(), nullValue());
+    assertThat(clusteredServer.getClusterRestartVersion(), nullValue());
+    assertThat(clusteredServer.getServerRestartVersion(), nullValue());
+    assertThat(nonClusteredServer.getDomainRestartVersion(), nullValue());
+    assertThat(nonClusteredServer.getClusterRestartVersion(), nullValue());
+    assertThat(nonClusteredServer.getServerRestartVersion(), nullValue());
+  }
+
+  @Test
+  public void whenDomainReadFromYaml_DomainRestartVersion() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML);
+    assertThat(domain.getAdminServerSpec().getDomainRestartVersion(), is("1"));
+    assertThat(domain.getAdminServerSpec().getClusterRestartVersion(), nullValue());
+    assertThat(domain.getAdminServerSpec().getServerRestartVersion(), nullValue());
+  }
+
+  @Test
+  public void whenDomainReadFromYaml_ClusterRestartVersion() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML);
+    ServerSpec serverSpec = domain.getServer("server1", "cluster2");
+
+    assertThat(serverSpec.getDomainRestartVersion(), is("1"));
+    assertThat(serverSpec.getClusterRestartVersion(), is("2"));
+    assertThat(serverSpec.getServerRestartVersion(), nullValue());
+  }
+
+  @Test
+  public void whenDomainReadFromYaml_ServerRestartVersion() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML);
+    ServerSpec serverSpec = domain.getServer("server2", null);
+
+    assertThat(serverSpec.getDomainRestartVersion(), is("1"));
+    assertThat(serverSpec.getClusterRestartVersion(), nullValue());
+    assertThat(serverSpec.getServerRestartVersion(), is("3"));
+  }
+
   @Test
   public void whenVolumesConfiguredOnMultipleLevels_useCombination() {
     configureDomain(domain)
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-3.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-3.yaml
@@ -15,7 +15,6 @@ spec:
   asName: admin
   # The Admin Server's ListenPort
   asPort: 8001
-  # The WebLogic Domain Name
 
   adminServer:
   # the T3 endpoints to export. Each entry is an endpoint name,
@@ -38,6 +37,7 @@ spec:
       serviceAnnotations:
         testKey3: testValue3
         longer: shorter
+    restartVersion: "1"
 
   domainName: base_domain
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample.yaml
@@ -63,6 +63,9 @@ spec:
 
   # configured wls configuration overrides secret names
   configOverrideSecrets: [overrides-secret-1, overrides-secret-2]
+  
+  # Restart version 
+  restartVersion: "1"
 
   adminServer:
     # The Admin Server's NodePort (optional)
@@ -98,7 +101,8 @@ spec:
             memory: "256Mi"
     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:
@@ -110,3 +114,5 @@ spec:
           value: "-verbose"
         - name: USER_MEM_ARGS
           value: "-Xms64m -Xmx256m "
+      restartVersion: "2"
+      
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/AdminPodHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/AdminPodHelperTest.java
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java

Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,6 @@ ClusterConfigurator withLivenessProbeSettings(`
`47`	`47`	`ClusterConfigurator withServiceLabel(String name, String value);`
`48`	`48`
`49`	`49`	`ClusterConfigurator withServiceAnnotation(String name, String value);`
	`50`	`+`
	`51`	`+ ClusterConfigurator withRestartVersion(String restartVersion);`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,6 @@ ServerConfigurator withReadinessProbeSettings(`
`45`	`45`	`ServerConfigurator withServiceLabel(String name, String value);`
`46`	`46`
`47`	`47`	`ServerConfigurator withServiceAnnotation(String name, String value);`
	`48`	`+`
	`49`	`+ ServerConfigurator withRestartVersion(String restartVersion);`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`public class AdminServerSpecV2Impl extends ServerSpecV2Impl {`
`8`	`8`	`public AdminServerSpecV2Impl(DomainSpec spec, AdminServer server) {`
`9`		`- super(spec, server, null, spec);`
	`9`	`+ super(spec, server, null, null);`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,12 @@ public DomainConfigurator withPodSecurityContext(V1PodSecurityContext podSecurit`
`218`	`218`	`return this;`
`219`	`219`	`}`
`220`	`220`
	`221`	`+ @Override`
	`222`	`+ public DomainConfigurator withRestartVersion(String restartVersion) {`
	`223`	`+ ((BaseConfiguration) getDomainSpec()).setRestartVersion(restartVersion);`
	`224`	`+ return this;`
	`225`	`+ }`
	`226`	`+`
`221`	`227`	`class ServerConfiguratorImpl implements ServerConfigurator {`
`222`	`228`	`private Server server;`
`223`	`229`
`@@ -328,6 +334,12 @@ public ServerConfigurator withServiceAnnotation(String name, String value) {`
`328`	`334`	`server.addServiceAnnotations(name, value);`
`329`	`335`	`return this;`
`330`	`336`	`}`
	`337`	`+`
	`338`	`+ @Override`
	`339`	`+ public ServerConfigurator withRestartVersion(String restartVersion) {`
	`340`	`+ server.setRestartVersion(restartVersion);`
	`341`	`+ return this;`
	`342`	`+ }`
`331`	`343`	`}`
`332`	`344`
`333`	`345`	`@Override`
`@@ -472,5 +484,11 @@ public ClusterConfigurator withServiceAnnotation(String name, String value) {`
`472`	`484`	`cluster.addServiceAnnotations(name, value);`
`473`	`485`	`return this;`
`474`	`486`	`}`
	`487`	`+`
	`488`	`+ @Override`
	`489`	`+ public ClusterConfigurator withRestartVersion(String restartVersion) {`
	`490`	`+ cluster.setRestartVersion(restartVersion);`
	`491`	`+ return this;`
	`492`	`+ }`
`475`	`493`	`}`
`476`	`494`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ protected Server getConfiguration() {`
`20`	`20`	`Server configuration = new Server();`
`21`	`21`	`configuration.fillInFrom(this);`
`22`	`22`	`configuration.setNodePort(nodePort);`
	`23`	`+ configuration.setRestartVersion(this.getRestartVersion());`
`23`	`24`	`return configuration;`
`24`	`25`	`}`
`25`	`26`