Merge pull request openshift-kni#1313 from openshift-kni/minimize-update-calls-lite

controller: minimize update calls (reduced)

Author: ffromani

pkg/numaresourcesscheduler/objectstate/sched/sched.go

@@ -109,7 +109,7 @@ func (em ExistingManifests) State(mf schedmanifests.Manifests) []objectstate.Obj
 			Error:    em.deploymentError,
 			Desired:  mf.Deployment.DeepCopy(),
 			Compare:  compare.Object,
-			Merge:    merge.MetadataForUpdate,
+			Merge:    merge.ObjectForUpdate,
 		},
 	}
 }

pkg/objectstate/api/api.go

@@ -43,7 +43,7 @@ func (em *ExistingManifests) State(mf apimanifests.Manifests) []objectstate.Obje
 			Error:    em.CrdError,
 			Desired:  mf.Crd.DeepCopy(),
 			Compare:  compare.Object,
-			Merge:    merge.MetadataForUpdate,
+			Merge:    merge.ObjectForUpdate,
 		},
 	}
 }

pkg/objectstate/merge/merge.go

@@ -17,19 +17,19 @@
 package merge
 
 import (
-	"fmt"
+	"errors"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 var (
-	ErrWrongObjectType    = fmt.Errorf("given object does not match the merger")
-	ErrMismatchingObjects = fmt.Errorf("given objects have mismatching types")
+	ErrWrongObjectType    = errors.New("given object does not match the merger")
+	ErrMismatchingObjects = errors.New("given objects have mismatching types")
 )
 
 func ServiceAccountForUpdate(current, updated client.Object) (client.Object, error) {
@@ -42,7 +42,7 @@ func ServiceAccountForUpdate(current, updated client.Object) (client.Object, err
 		return nil, ErrMismatchingObjects
 	}
 	preserveServiceAccountPullSecrets(curSA, updSA)
-	return MetadataForUpdate(current, updated)
+	return ObjectForUpdate(current, updated)
 }
 
 func ServiceForUpdate(current, updated client.Object) (client.Object, error) {
@@ -55,7 +55,7 @@ func ServiceForUpdate(current, updated client.Object) (client.Object, error) {
 		return updated, ErrMismatchingObjects
 	}
 	preserveIPConfigurations(&curSE.Spec, &updSE.Spec)
-	return MetadataForUpdate(current, updated)
+	return ObjectForUpdate(current, updated)
 }
 
 func ObjectForUpdate(current, updated client.Object) (client.Object, error) {
@@ -75,8 +75,8 @@ func StatusForUpdate(current client.Object, updated client.Object) (client.Objec
 		updated.(*appsv1.DaemonSet).Status = currentTyped.Status
 	case *corev1.Service:
 		updated.(*corev1.Service).Status = currentTyped.Status
-	case *v1.CustomResourceDefinition:
-		updated.(*v1.CustomResourceDefinition).Status = currentTyped.Status
+	case *apiextv1.CustomResourceDefinition:
+		updated.(*apiextv1.CustomResourceDefinition).Status = currentTyped.Status
 	default:
 		return updated, nil
 	}