Retry conflicting update after fetching latest pod spec

Author: Ankita Thomas

pkg/controller/registry/reconciler/grpc.go

@@ -3,7 +3,6 @@ package reconciler
 import (
 	"context"
 	"fmt"
-
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorlister"
@@ -14,7 +13,10 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const CatalogSourceUpdateKey = "catalogsource.operators.coreos.com/update"
@@ -198,12 +200,28 @@ func (c *GrpcRegistryReconciler) ensureUpdatePod(source grpcCatalogSourceDecorat
 			updatePod.Labels[CatalogSourceUpdateKey] = ""
 
 			// Update the update pod to promote it to serving pod
-			_, err := c.OpClient.KubernetesInterface().CoreV1().Pods(source.GetNamespace()).Update(context.TODO(), updatePod, metav1.UpdateOptions{})
+			forceApply := true
+			opts := metav1.PatchOptions{
+				Force:        &forceApply,
+				FieldManager: "operator-lifecycle-manager-registry-reconciler",
+			}
+
+			updatePodBytes, err := client.Apply.Data(updatePod)
 			if err != nil {
-				return errors.Wrapf(err, "error creating new pod: %s", source.Pod().GetName())
+				return errors.Wrapf(err, "error serializing updated catalog source pod to bytes: %s", source.Pod().GetName())
 			}
 
-			break
+			if updatePod.GroupVersionKind().Empty() {
+				updatePod.SetGroupVersionKind(schema.GroupVersionKind{
+					Group:   "",
+					Version: "v1",
+					Kind:    "Pod",
+				})
+			}
+			_, err = c.OpClient.KubernetesInterface().CoreV1().Pods(source.GetNamespace()).Patch(context.TODO(), updatePod.Name, types.ApplyPatchType, updatePodBytes, opts)
+			if err != nil {
+				return errors.Wrapf(err, "error updating catalog source pod: %s", source.Pod().GetName())
+			}
 		}
 	}