Use patch instead of update for GCPControllerManager

Author: mimowo

cmd/gcp-controller-manager/BUILD

@@ -103,6 +103,7 @@ go_library(
         "//vendor/k8s.io/kubernetes/pkg/controller",
         "//vendor/k8s.io/kubernetes/pkg/controller/certificates",
         "//vendor/k8s.io/kubernetes/pkg/features",
+        "//vendor/k8s.io/kubernetes/pkg/util/pod",
         "//vendor/k8s.io/kubernetes/pkg/util/taints",
     ],
 )
@@ -139,6 +140,7 @@ go_test(
         "//vendor/k8s.io/apimachinery/pkg/runtime",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor/k8s.io/apimachinery/pkg/types",
+        "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch",
         "//vendor/k8s.io/client-go/kubernetes/fake",
         "//vendor/k8s.io/client-go/listers/core/v1:core",
         "//vendor/k8s.io/client-go/testing",

cmd/gcp-controller-manager/node_csr_approver.go

@@ -56,6 +56,7 @@ import (
 	certutil "k8s.io/kubernetes/pkg/apis/certificates/v1"
 	"k8s.io/kubernetes/pkg/controller/certificates"
 	"k8s.io/kubernetes/pkg/features"
+	utilpod "k8s.io/kubernetes/pkg/util/pod"
 )
 
 const (
@@ -1038,17 +1039,15 @@ func markFailedAndDeletePodWithCondition(ctx *controllerContext, pod *v1.Pod) er
 		// is orphaned, in which case the pod would remain in the Running phase
 		// forever as there is no kubelet running to change the phase.
 		if pod.Status.Phase != v1.PodSucceeded && pod.Status.Phase != v1.PodFailed {
-			newPod := pod.DeepCopy()
-			newPod.Status.Phase = v1.PodFailed
-			apipod.UpdatePodCondition(&newPod.Status, &v1.PodCondition{
+			newStatus := pod.Status.DeepCopy()
+			newStatus.Phase = v1.PodFailed
+			apipod.UpdatePodCondition(newStatus, &v1.PodCondition{
 				Type:    v1.DisruptionTarget,
 				Status:  v1.ConditionTrue,
 				Reason:  "DeletionByGCPControllerManager",
 				Message: fmt.Sprintf("%s: node no longer exists", fieldManager),
 			})
-			if _, err := ctx.client.CoreV1().Pods(pod.Namespace).UpdateStatus(context.TODO(), newPod, metav1.UpdateOptions{
-				FieldManager: fieldManager,
-			}); err != nil {
+			if _, _, _, err := utilpod.PatchPodStatus(context.TODO(), ctx.client, pod.Namespace, pod.Name, pod.UID, pod.Status, *newStatus); err != nil {
 				return err
 			}
 		}

cmd/gcp-controller-manager/node_csr_approver_test.go

@@ -50,6 +50,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/kubernetes/fake"
 	testclient "k8s.io/client-go/testing"
 	"k8s.io/cloud-provider-gcp/pkg/nodeidentity"
@@ -1875,12 +1876,12 @@ func TestDeleteAllPodsBoundToNode(t *testing.T) {
 				t.Fatalf("Unexpected number of actions, got %v, want 3 (list pods, patch pod, delete pod)", len(actions))
 			}
 
-			var updateAction testclient.UpdateAction
+			var patchAction testclient.PatchAction
 			var deleteAction testclient.DeleteAction
 
 			for _, action := range actions {
-				if action.GetVerb() == "update" {
-					updateAction = action.(testclient.UpdateAction)
+				if action.GetVerb() == "patch" {
+					patchAction = action.(testclient.PatchAction)
 				}
 
 				if action.GetVerb() == "delete" {
@@ -1889,8 +1890,23 @@ func TestDeleteAllPodsBoundToNode(t *testing.T) {
 			}
 
 			if tc.expectedPatchedPod != nil {
-				patchedPod := updateAction.GetObject().(*v1.Pod)
-				if diff := cmp.Diff(tc.expectedPatchedPod, patchedPod, cmpopts.IgnoreFields(v1.Pod{}, "TypeMeta"), cmpopts.IgnoreFields(v1.PodCondition{}, "LastTransitionTime")); diff != "" {
+				patchedPodBytes := patchAction.GetPatch()
+
+				originalPod, err := json.Marshal(tc.pod)
+				if err != nil {
+					t.Fatalf("Failed to marshal original pod %#v: %v", originalPod, err)
+				}
+				updated, err := strategicpatch.StrategicMergePatch(originalPod, patchedPodBytes, v1.Pod{})
+				if err != nil {
+					t.Fatalf("Failed to apply strategic merge patch %q on pod %#v: %v", patchedPodBytes, originalPod, err)
+				}
+
+				updatedPod := &v1.Pod{}
+				if err := json.Unmarshal(updated, updatedPod); err != nil {
+					t.Fatalf("Failed to unmarshal updated pod %q: %v", updated, err)
+				}
+
+				if diff := cmp.Diff(tc.expectedPatchedPod, updatedPod, cmpopts.IgnoreFields(v1.Pod{}, "TypeMeta"), cmpopts.IgnoreFields(v1.PodCondition{}, "LastTransitionTime")); diff != "" {
 					t.Fatalf("Unexpected diff on pod (-want,+got):\n%s", diff)
 				}
 			}

vendor/k8s.io/kubernetes/pkg/util/pod/BUILD

@@ -1443,6 +1443,7 @@ k8s.io/kubernetes/pkg/features
 k8s.io/kubernetes/pkg/fieldpath
 k8s.io/kubernetes/pkg/util/hash
 k8s.io/kubernetes/pkg/util/parsers
+k8s.io/kubernetes/pkg/util/pod
 k8s.io/kubernetes/pkg/util/taints
 # k8s.io/metrics v0.28.0 => k8s.io/metrics v0.28.0
 ## explicit; go 1.20