fix: change rolling update logic to a json merge patch

closes: #7072

Signed-off-by: Steve Hawkins <[email protected]>
# Conflicts:
#	CHANGELOG.md

Author: shawkins

CHANGELOG.md

@@ -4,8 +4,9 @@
 
 #### Bugs
 * Fix #7148: corrected octal format detection
-* Fix #7167: Allow Informer.isWatching to see underlying Watch state
-* Fix #7087: Avoid possible NPE in OkHttp websocket handlinger
+- Fix #7167: Allow Informer.isWatching to see underlying Watch state
+* Fix #7087: Avoid possible NPE in OkHttp websocket handling
+* Fix #7072: Changed rolling update handling to json merge patch to avoid 422 errors
 * Fix #7080: Avoid NPE in CRDGenerator if post-processor is set to null
 * Fix #7116: (java-generator) Use timezone format compatible with Kubernetes
 * Fix #7163: Ensure that streams are notified of errors

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java

@@ -45,6 +45,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.AbstractMap;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -168,40 +169,30 @@ public T rollUpdate(T oldObj, T newObj) {
     }
   }
 
-  private static <T> T applyPatch(Resource<T> resource, List<Object> list, KubernetesSerialization serialization) {
-    return resource.patch(PatchContext.of(PatchType.JSON), serialization.asJson(list));
+  private static <T> T applyPatch(Resource<T> resource, Map<String, Object> map, KubernetesSerialization serialization) {
+    return resource.patch(PatchContext.of(PatchType.JSON_MERGE), serialization.asJson(map));
   }
 
   public static <T extends HasMetadata> T resume(RollableScalableResourceOperation<T, ?, ?> resource) {
-    return applyPatch(resource, RollingUpdater.requestPayLoadForRolloutResume(), resource.getKubernetesSerialization());
+    return applyPatch(resource, RollingUpdater.requestPayLoadForRollout(null), resource.getKubernetesSerialization());
   }
 
   public static <T extends HasMetadata> T pause(RollableScalableResourceOperation<T, ?, ?> resource) {
-    return applyPatch(resource, RollingUpdater.requestPayLoadForRolloutPause(), resource.getKubernetesSerialization());
+    return applyPatch(resource, RollingUpdater.requestPayLoadForRollout(Boolean.TRUE), resource.getKubernetesSerialization());
   }
 
   public static <T extends HasMetadata> T restart(RollableScalableResourceOperation<T, ?, ?> resource) {
     return applyPatch(resource, RollingUpdater.requestPayLoadForRolloutRestart(), resource.getKubernetesSerialization());
   }
 
-  public static List<Object> requestPayLoadForRolloutPause() {
-    return List.of(Map.of(
-        "op", "add",
-        "path", "/spec/paused",
-        "value", true));
+  public static Map<String, Object> requestPayLoadForRollout(Boolean paused) {
+    return Map.of("spec", new AbstractMap.SimpleEntry<>("paused", paused));
   }
 
-  public static List<Object> requestPayLoadForRolloutResume() {
-    return List.of(Map.of(
-        "op", "remove",
-        "path", "/spec/paused"));
-  }
-
-  public static List<Object> requestPayLoadForRolloutRestart() {
-    return List.of(Map.of(
-        "op", "add",
-        "path", "/spec/template/metadata/annotations/kubectl.kubernetes.io~1restartedAt",
-        "value", new Date().toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)));
+  public static Map<String, Object> requestPayLoadForRolloutRestart() {
+    String now = new Date().toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+    return Map.of("spec",
+        Map.of("template", Map.of("metadata", Map.of("annotations", Map.of("kubectl.kubernetes.io/restartedAt", now)))));
   }
 
   /**

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java

@@ -623,8 +623,8 @@ void testRolloutPause() throws InterruptedException {
     // Then
     RecordedRequest recordedRequest = server.getLastRequest();
     assertEquals("PATCH", recordedRequest.getMethod());
-    assertThat(client.getKubernetesSerialization().unmarshal(recordedRequest.getBody().readUtf8(), List.class))
-        .isEqualTo(List.of(Map.of("op", "add", "path", "/spec/paused", "value", true)));
+    assertThat(recordedRequest.getBody().readUtf8())
+        .isEqualTo("{\"spec\":{\"paused\":true}}");
   }
 
   @Test
@@ -654,8 +654,8 @@ void testRolloutResume() throws InterruptedException {
     RecordedRequest recordedRequest = server.getLastRequest();
     assertNotNull(deployment);
     assertEquals("PATCH", recordedRequest.getMethod());
-    assertThat(client.getKubernetesSerialization().unmarshal(recordedRequest.getBody().readUtf8(), List.class))
-        .isEqualTo(List.of(Map.of("op", "remove", "path", "/spec/paused")));
+    assertThat(recordedRequest.getBody().readUtf8())
+        .isEqualTo("{\"spec\":{\"paused\":null}}");
   }
 
   @Test
@@ -685,7 +685,7 @@ void testRolloutRestart() throws InterruptedException {
     RecordedRequest recordedRequest = server.getLastRequest();
     assertNotNull(deployment);
     assertEquals("PATCH", recordedRequest.getMethod());
-    assertTrue(recordedRequest.getBody().readUtf8().contains("kubectl.kubernetes.io~1restartedAt"));
+    assertTrue(recordedRequest.getBody().readUtf8().contains("kubectl.kubernetes.io/restartedAt"));
   }
 
   @Test

kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StatefulSetTest.java

@@ -399,7 +399,7 @@ void testRolloutRestart() throws InterruptedException {
     RecordedRequest recordedRequest = server.getLastRequest();
     assertNotNull(deployment);
     assertEquals("PATCH", recordedRequest.getMethod());
-    assertTrue(recordedRequest.getBody().readUtf8().contains("kubectl.kubernetes.io~1restartedAt"));
+    assertTrue(recordedRequest.getBody().readUtf8().contains("kubectl.kubernetes.io/restartedAt"));
   }
 
   @Test