WIP: demo: ApplyState usage

the new API ApplyState should initially used only in the new code which deals with HCP and machineconfig removal (PR #1025) Signed-off-by: Francesco Romani <[email protected]>
openshift-kni · Oct 9, 2024 · 2f145d9 · 2f145d9
1 parent b148f46
commit 2f145d9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/controllers/numaresourcesoperator_controller.go b/controllers/numaresourcesoperator_controller.go
@@ -305,7 +305,7 @@ func (r *NUMAResourcesOperatorReconciler) syncNodeResourceTopologyAPI(ctx contex
 	var updatedCount int
 	objStates := existing.State(r.APIManifests)
 	for _, objState := range objStates {
-		_, updated, err2 := apply.ApplyObject(ctx, r.Client, objState)
+		_, updated, err2 := apply.ApplyState(ctx, r.Client, objState)
 		if err2 != nil {
 			err = errors.Wrapf(err2, "could not create %s", objState.Desired.GetObjectKind().GroupVersionKind().String())
 			break
@@ -338,7 +338,7 @@ func (r *NUMAResourcesOperatorReconciler) syncMachineConfigs(ctx context.Context
 			break
 		}
 
-		_, updated, err2 := apply.ApplyObject(ctx, r.Client, objState)
+		_, updated, err2 := apply.ApplyState(ctx, r.Client, objState)
 		if err2 != nil {
 			err = errors.Wrapf(err2, "could not apply (%s) %s/%s", objState.Desired.GetObjectKind().GroupVersionKind(), objState.Desired.GetNamespace(), objState.Desired.GetName())
 			break
@@ -477,7 +477,7 @@ func (r *NUMAResourcesOperatorReconciler) syncNUMAResourcesOperatorResources(ctx
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to set controller reference to %s %s", objState.Desired.GetNamespace(), objState.Desired.GetName())
 		}
-		obj, _, err := apply.ApplyObject(ctx, r.Client, objState)
+		obj, _, err := apply.ApplyState(ctx, r.Client, objState)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to apply (%s) %s/%s", objState.Desired.GetObjectKind().GroupVersionKind(), objState.Desired.GetNamespace(), objState.Desired.GetName())
 		}