Add support for pod changes due to node selectors and resource limits/requests

Author: russgold

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

@@ -8,6 +8,7 @@
 import static oracle.kubernetes.operator.VersionConstants.DEFAULT_DOMAIN_VERSION;
 
 import io.kubernetes.client.custom.IntOrString;
+import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.models.*;
 import java.io.File;
 import java.util.*;
@@ -23,6 +24,7 @@
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.ServerSpec;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 @SuppressWarnings("deprecation")
@@ -279,19 +281,23 @@ private static boolean isCurrentPodValid(V1Pod build, V1Pod current) {
   private static boolean isCurrentPodMetadataValid(V1ObjectMeta build, V1ObjectMeta current) {
     return VersionHelper.matchesResourceVersion(current, DEFAULT_DOMAIN_VERSION)
         && isRestartVersionValid(build, current)
-        && Objects.equals(getCustomerLabels(current), getCustomerLabels(build))
-        && Objects.equals(current.getAnnotations(), build.getAnnotations());
+        && mapEquals(getCustomerLabels(current), getCustomerLabels(build))
+        && mapEquals(current.getAnnotations(), build.getAnnotations());
   }
 
   private static boolean isCurrentPodSpecValid(
       V1PodSpec build, V1PodSpec current, List<String> ignoring) {
     return Objects.equals(current.getSecurityContext(), build.getSecurityContext())
-        //  && Objects.equals(current.getNodeSelector(), build.getNodeSelector())
+        && mapEquals(current.getNodeSelector(), build.getNodeSelector())
         && equalSets(volumesWithout(current.getVolumes(), ignoring), build.getVolumes())
         && equalSets(current.getImagePullSecrets(), build.getImagePullSecrets())
         && areCompatible(build.getContainers(), current.getContainers(), ignoring);
   }
 
+  private static <K, V> boolean mapEquals(Map<K, V> first, Map<K, V> second) {
+    return Objects.equals(first, second) || (MapUtils.isEmpty(first) && MapUtils.isEmpty(second));
+  }
+
   private static boolean areCompatible(
       List<V1Container> build, List<V1Container> current, List<String> ignoring) {
     if (build != null) {
@@ -323,6 +329,7 @@ private static boolean isCompatible(
         && Objects.equals(current.getSecurityContext(), build.getSecurityContext())
         && equalSettings(current.getLivenessProbe(), build.getLivenessProbe())
         && equalSettings(current.getReadinessProbe(), build.getReadinessProbe())
+        && resourcesEqual(current.getResources(), build.getResources())
         && equalSets(mountsWithout(current.getVolumeMounts(), ignoring), build.getVolumeMounts())
         && equalSets(current.getPorts(), build.getPorts())
         && equalSets(current.getEnv(), build.getEnv())
@@ -335,6 +342,18 @@ private static boolean equalSettings(V1Probe probe1, V1Probe probe2) {
         && Objects.equals(probe1.getPeriodSeconds(), probe2.getPeriodSeconds());
   }
 
+  private static boolean resourcesEqual(V1ResourceRequirements a, V1ResourceRequirements b) {
+    return mapEquals(getLimits(a), getLimits(b)) && mapEquals(getRequests(a), getRequests(b));
+  }
+
+  private static Map<String, Quantity> getLimits(V1ResourceRequirements requirements) {
+    return requirements == null ? Collections.emptyMap() : requirements.getLimits();
+  }
+
+  private static Map<String, Quantity> getRequests(V1ResourceRequirements requirements) {
+    return requirements == null ? Collections.emptyMap() : requirements.getRequests();
+  }
+
   private static List<V1Volume> volumesWithout(
       List<V1Volume> volumeMounts, List<String> volumesToIgnore) {
     List<V1Volume> result = new ArrayList<>(volumeMounts);

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

@@ -76,7 +76,8 @@ protected void verifyReplacePodWhen(PodMutator mutator) {
     assertThat(logRecords, containsInfo(getPodReplacedMessageKey()));
   }
 
-  private void verifyAdminPodNotReplacedWhen(PodMutator mutator) {
+  @Override
+  protected void verifyPodNotReplacedWhen(PodMutator mutator) {
     testSupport.addComponent(
         ProcessingConstants.PODWATCHER_COMPONENT_NAME,
         PodAwaiterStepFactory.class,
@@ -162,7 +163,7 @@ public void whenExistingAdminPodSpecHasUnknownAddedVolumes_replaceIt() {
 
   @Test
   public void whenExistingAdminPodSpecHasK8sVolume_ignoreIt() {
-    verifyAdminPodNotReplacedWhen(
+    verifyPodNotReplacedWhen(
         (pod) -> {
           pod.getSpec().addVolumesItem(new V1Volume().name("k8s"));
           getSpecContainer(pod)
@@ -202,7 +203,7 @@ public void whenExistingAdminPodSpecHasUnneededVolumeMount_replaceIt() {
 
   @Test
   public void whenExistingAdminPodSpecHasK8sVolumeMount_ignoreIt() {
-    verifyAdminPodNotReplacedWhen(
+    verifyPodNotReplacedWhen(
         (pod) ->
             getSpecContainer(pod)
                 .addVolumeMountsItem(

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

@@ -154,7 +154,7 @@ public void whenExistingManagedPodSpecHasSuperfluousVolume_replaceIt() {
 
   @Test
   public void whenExistingManagedPodSpecHasK8sVolume_ignoreIt() {
-    verifyManagedPodNotRolledWhen(
+    verifyPodNotReplacedWhen(
         (pod) -> {
           pod.getSpec().addVolumesItem(new V1Volume().name("k8s"));
           getSpecContainer(pod)
@@ -189,7 +189,7 @@ public void whenExistingManagedPodSpecHasExtraVolumeMount_replaceIt() {
 
   @Test
   public void whenExistingManagedPodSpecHasK8sVolumeMount_ignoreIt() {
-    verifyManagedPodNotRolledWhen(
+    verifyPodNotReplacedWhen(
         (pod) ->
             getSpecContainer(pod)
                 .addVolumeMountsItem(
@@ -532,7 +532,8 @@ private Map<String, StepAndPacket> computePodsToRoll(PodMutator mutator) {
     return rolling;
   }
 
-  private void verifyManagedPodNotRolledWhen(PodMutator mutator) {
+  @Override
+  protected void verifyPodNotReplacedWhen(PodMutator mutator) {
     Map<String, StepAndPacket> rolling = computePodsToRoll(mutator);
 
     assertThat(rolling, is(anEmptyMap()));

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

@@ -305,6 +305,8 @@ private ServerConfigurator configureDomainV2Server() {
 
   protected abstract void verifyReplacePodWhen(PodMutator mutator);
 
+  protected abstract void verifyPodNotReplacedWhen(PodMutator mutator);
+
   protected abstract ServerConfigurator getServerConfigurator(
       DomainConfigurator configurator, String serverName);
 
@@ -465,12 +467,16 @@ public void whenPodSecurityContextIsDifferent_replaceIt() {
   }
 
   @Test
-  @Ignore
-  public void whenPodHasDifferentNodeSelector_dontReplaceIt() {
+  public void whenPodHasDifferentNodeSelector_replaceIt() {
     configurator.withNodeSelector("key", "value");
     verifyReplacePodWhen(pod -> {});
   }
 
+  @Test
+  public void whenNullVsEmptyNodeSelector_dontReplaceIt() {
+    verifyPodNotReplacedWhen(pod -> pod.getSpec().setNodeSelector(null));
+  }
+
   @Test
   public void whenPodContainerSecurityContextIsDifferent_replaceIt() {
     configurator.withContainerSecurityContext(new V1SecurityContext().runAsGroup(9876L));
@@ -489,6 +495,23 @@ public void whenPodReadinessProbeSettingsAreDifferent_replaceIt() {
     verifyReplacePodWhen(pod -> {});
   }
 
+  @Test
+  public void whenPodRequestRequirementIsDifferent_replaceIt() {
+    configurator.withRequestRequirement("resource", "5");
+    verifyReplacePodWhen(pod -> {});
+  }
+
+  @Test
+  public void whenPodRequestRequirementsEmptyVsNull_dontReplaceIt() {
+    verifyPodNotReplacedWhen(pod -> pod.getSpec().getContainers().get(0).resources(null));
+  }
+
+  @Test
+  public void whenPodLimitRequirementIsDifferent_replaceIt() {
+    configurator.withLimitRequirement("limit", "7");
+    verifyReplacePodWhen(pod -> {});
+  }
+
   protected void onAdminExpectListPersistentVolume() {
     // default is no-op
   }