Make use of patch instead of update (#584)

Author: johscheuer

kubectl-fdb/cmd/exec_test.go

@@ -96,7 +96,7 @@ func TestBuildCommand(t *testing.T) {
 			scheme := runtime.NewScheme()
 			_ = clientgoscheme.AddToScheme(scheme)
 			_ = fdbtypes.AddToScheme(scheme)
-			kubeClient := fake.NewFakeClientWithScheme(scheme, &cluster, &podList)
+			kubeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(&cluster, &podList).Build()
 
 			command, err := buildCommand(kubeClient, tc.ClusterName, tc.Context, namespace, tc.Command)
 

kubectl-fdb/cmd/remove_instances.go

@@ -192,6 +192,8 @@ func removeInstances(kubeClient client.Client, clusterName string, instances []s
 		}
 	}
 
+	patch := client.MergeFrom(cluster.DeepCopy())
+
 	for class, amount := range shrinkMap {
 		cluster.Spec.ProcessCounts.DecreaseCount(class, amount)
 	}
@@ -209,5 +211,5 @@ func removeInstances(kubeClient client.Client, clusterName string, instances []s
 		cluster.Spec.InstancesToRemoveWithoutExclusion = append(cluster.Spec.InstancesToRemoveWithoutExclusion, instances...)
 	}
 
-	return kubeClient.Update(ctx.TODO(), &cluster)
+	return kubeClient.Patch(ctx.TODO(), &cluster, patch)
 }

kubectl-fdb/cmd/remove_instances_test.go

@@ -128,7 +128,7 @@ func TestRemoveInstances(t *testing.T) {
 			scheme := runtime.NewScheme()
 			_ = clientgoscheme.AddToScheme(scheme)
 			_ = fdbtypes.AddToScheme(scheme)
-			kubeClient := fake.NewFakeClientWithScheme(scheme, &cluster, &podList)
+			kubeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(&cluster, &podList).Build()
 
 			err := removeInstances(kubeClient, clusterName, tc.Instances, namespace, tc.WithExclusion, tc.WithShrink, true)
 			if err != nil {
@@ -219,7 +219,7 @@ func TestGetInstanceIDsFromPod(t *testing.T) {
 			scheme := runtime.NewScheme()
 			_ = clientgoscheme.AddToScheme(scheme)
 			_ = fdbtypes.AddToScheme(scheme)
-			kubeClient := fake.NewFakeClientWithScheme(scheme, &podList)
+			kubeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(&podList).Build()
 
 			instances, err := getInstanceIDsFromPod(kubeClient, clusterName, tc.Instances, namespace)
 			if err != nil {