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

One more test for rolling restart

Author: rjeberhard

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

@@ -49,15 +49,16 @@ public abstract class BaseConfiguration {
   private String serverStartPolicy;
 
   /**
-   * Tells the operator whether the customer wants the to restart the pods. The value is a positive
-   * integer that customer has to increment, it can be defined in domain, cluster or server.
-   * Depending on where the value is incremented (domain, cluster or server) the pods assigned to
-   * such will be restarted.
+   * Tells the operator whether the customer wants the to restart the pods. The value can be any
+   * String and it can be defined in 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
+   * modify the value again after the pods were recreated, then pods will again be terminated and
+   * recreated.
    *
    * @since 2.0
    */
   @Description(
-      "If preseent, every time this integer value is incremented the operator will restart"
+      "If preseent, every time this value is updated the operator will restart"
           + " the required servers")
   private String restartVersion;
 

operator/src/test/java/oracle/kubernetes/operator/helpers/AdminPodHelperTest.java

@@ -14,6 +14,7 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
@@ -205,6 +206,14 @@ public void whenExistingAdminPodSpecContainerHasWrongEnvFrom_replaceIt() {
     verifyAdminPodReplacedWhen((pod) -> getSpecContainer(pod).envFrom(Collections.emptyList()));
   }
 
+  @Test
+  public void whenExistingAdminPodSpecContainerHasRestartVersion_replaceIt() {
+    verifyAdminPodReplacedWhen(
+        (pod) ->
+            pod.getMetadata()
+                .putLabelsItem(LabelConstants.SERVERRESTARTVERSION_LABEL, "adminRestartV1"));
+  }
+
   @Test
   public void whenAdminPodCreated_specHasPodNameAsHostName() {
     assertThat(getCreatedPod().getSpec().getHostname(), equalTo(getPodName()));
@@ -422,11 +431,12 @@ public void whenDomainAndAdminHasRestartVersion_createAdminPodWithRestartVersion
     getConfigurator()
         .withRestartVersion("domainRestartV1")
         .configureAdminServer((ADMIN_SERVER))
-          .withRestartVersion("adminRestartV1");
+        .withRestartVersion("adminRestartV1");
 
     Map<String, String> podLabels = getCreatedPod().getMetadata().getLabels();
     assertThat(podLabels, hasEntry(LabelConstants.DOMAINRESTARTVERSION_LABEL, "domainRestartV1"));
     assertThat(podLabels, hasEntry(LabelConstants.SERVERRESTARTVERSION_LABEL, "adminRestartV1"));
+    assertThat(podLabels, hasKey(not(LabelConstants.CLUSTERRESTARTVERSION_LABEL)));
   }
 
   @Override

operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java

@@ -13,6 +13,7 @@
 import static org.hamcrest.Matchers.anEmptyMap;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
@@ -377,6 +378,8 @@ public void whenClusterHasRestartVersion_createManagedPodWithRestartVersionLabel
 
     Map<String, String> podLabels = getCreatedPod().getMetadata().getLabels();
     assertThat(podLabels, hasEntry(LabelConstants.CLUSTERRESTARTVERSION_LABEL, "clusterRestartV1"));
+    assertThat(podLabels, hasKey(not(LabelConstants.DOMAINRESTARTVERSION_LABEL)));
+    assertThat(podLabels, hasKey(not(LabelConstants.SERVERRESTARTVERSION_LABEL)));
   }
 
   @Test
@@ -386,6 +389,8 @@ public void whenDomainHasRestartVersion_createManagedPodWithRestartVersionLabel(
 
     Map<String, String> podLabels = getCreatedPod().getMetadata().getLabels();
     assertThat(podLabels, hasEntry(LabelConstants.DOMAINRESTARTVERSION_LABEL, "domainRestartV1"));
+    assertThat(podLabels, hasKey(not(LabelConstants.CLUSTERRESTARTVERSION_LABEL)));
+    assertThat(podLabels, hasKey(not(LabelConstants.SERVERRESTARTVERSION_LABEL)));
   }
 
   @Test
@@ -479,7 +484,6 @@ public void whenPodHasCustomLabelConflictWithInternal_createManagedPodWithIntern
     assertThat(podLabels, hasEntry(LabelConstants.CREATEDBYOPERATOR_LABEL, "true"));
   }
 
-  @SuppressWarnings("unchecked")
   private void verifyRollManagedPodWhen(PodMutator mutator) {
     Map<String, StepAndPacket> rolling = new HashMap<>();
     testSupport.addToPacket(SERVERS_TO_ROLL, rolling);