restart pod if both patchable and non-patchable field changed

Author: russgold

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

@@ -529,14 +529,14 @@ public NextAction apply(Packet packet) {
       V1Pod currentPod = getSko().getPod().get();
       if (currentPod == null) {
         return doNext(createNewPod(getNext()), packet);
+      } else if (!canUseCurrentPod(currentPod)) {
+        LOGGER.info(MessageKeys.CYCLING_POD, currentPod, getPodModel());
+        return doNext(replaceCurrentPod(getNext()), packet);
       } else if (mustPatchPod(currentPod)) {
         return doNext(patchCurrentPod(currentPod, getNext()), packet);
-      } else if (canUseCurrentPod(currentPod)) {
+      } else {
         logPodExists();
         return doNext(packet);
-      } else {
-        LOGGER.info(MessageKeys.CYCLING_POD, currentPod, getPodModel());
-        return doNext(replaceCurrentPod(getNext()), packet);
       }
     }
   }

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

@@ -504,6 +504,13 @@ public void whenPodCustomerLabelHasBadValue_replaceIt() {
         "value");
   }
 
+  @Test
+  public void whenPodLacksExpectedCustomerLabelAndRequestRequirement_replaceIt() {
+    configurator.withPodLabel("expected.label", "value").withRequestRequirement("widgets", "10");
+
+    verifyReplacePodWhen(pod -> {});
+  }
+
   @Test
   public void whenPodHasUnknownCustomerAnnotations_ignoreIt() {
     verifyPodNotReplacedWhen(pod -> pod.getMetadata().putAnnotationsItem("annotation", "value"));

site/server-lifecycle.md

@@ -152,6 +152,11 @@ The operator will restart servers when any of the follow properties on the domai
 * `volumes`
 * `volumeMounts`
 
+**Note**: if the only change detected is the addition or modification of a domain-specified label or annotation, 
+the operator will *patch* the server's pod rather than restarting it. Removing a label or annotation from
+the domain resource will cause neither a restart nor a patch. It is possible to force a restart to remove
+such a label or annotation by modifying the restartVersion.
+
 ### Rolling restarts
 
 Clustered servers that need to be restarted are gradually restarted (for example, `rolling restarted`) so that the cluster is not taken out of service and in-flight work can be migrated to other servers in the cluster.