eliminate imports of Kueue's podset package

Author: dgrove-oss

internal/controller/appwrapper/resource_management.go

@@ -35,7 +35,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/kueue/pkg/podset"
 )
 
 func parseComponent(raw []byte, expectedNamespace string) (*unstructured.Unstructured, error) {
@@ -241,7 +240,7 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *awv1beta
 		if len(toInject.Annotations) > 0 {
 			existing := toMap(metadata["annotations"])
 			if err := utilmaps.HaveConflict(existing, toInject.Annotations); err != nil {
-				return podset.BadPodSetsUpdateError("annotations", err), true
+				return fmt.Errorf("conflict updating annotations: %w", err), true
 			}
 			metadata["annotations"] = utilmaps.MergeKeepFirst(existing, toInject.Annotations)
 		}
@@ -250,15 +249,15 @@ func (r *AppWrapperReconciler) createComponent(ctx context.Context, aw *awv1beta
 		mergedLabels := utilmaps.MergeKeepFirst(toInject.Labels, awLabels)
 		existing := toMap(metadata["labels"])
 		if err := utilmaps.HaveConflict(existing, mergedLabels); err != nil {
-			return podset.BadPodSetsUpdateError("labels", err), true
+			return fmt.Errorf("conflict updating labels: %w", err), true
 		}
 		metadata["labels"] = utilmaps.MergeKeepFirst(existing, mergedLabels)
 
 		// NodeSelectors
 		if len(toInject.NodeSelector) > 0 {
 			existing := toMap(spec["nodeSelector"])
 			if err := utilmaps.HaveConflict(existing, toInject.NodeSelector); err != nil {
-				return podset.BadPodSetsUpdateError("nodeSelector", err), true
+				return fmt.Errorf("conflict updating nodeSelector: %w", err), true
 			}
 			spec["nodeSelector"] = utilmaps.MergeKeepFirst(existing, toInject.NodeSelector)
 		}

internal/util/maps.go

@@ -15,11 +15,12 @@ limitations under the License.
 */
 
 /*
-	This file contains a copy of the functions from https://github.com/kubernetes-sigs/kueue/blob/main/pkg/util/maps/maps.go
+	This file contains a copy of the two map utility functions from
+	https://github.com/kubernetes-sigs/kueue/blob/main/pkg/util/maps/maps.go
 	that are used by the AppWrapper controlller.
 
-	We copy the used functions to eliminate our go dependency on Kueue, which simplifies bundling AppWrapper
-	in the codeflare-operator in RedHat OpenShift AI.
+	We "vendor" the used functions to eliminate our go dependency on Kueue.
+	This simplifies bundling AppWrapper in the codeflare-operator in RedHat OpenShift AI.
 */
 
 package maps