temporary: squash if this works

2uasimojo · 2uasimojo · commit a7645be2db50 · 2025-11-04T17:04:30.000-06:00
diff --git a/pkg/controller/utils/statefulset.go b/pkg/controller/utils/statefulset.go
@@ -11,32 +11,15 @@ import (
 	"strings"
 
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
-	"github.com/openshift/hive/pkg/util/scheme"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
 	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var (
-	appsScheme = scheme.GetScheme()
-	appsCodecs = serializer.NewCodecFactory(appsScheme)
-)
-
-// ReadStatefulsetOrDie converts a statefulset asset into an actual instance of a statefulset.
-func ReadStatefulsetOrDie(objBytes []byte) *appsv1.StatefulSet {
-	requiredObj, err := runtime.Decode(appsCodecs.UniversalDecoder(appsv1.SchemeGroupVersion), objBytes)
-	if err != nil {
-		panic(err)
-	}
-	return requiredObj.(*appsv1.StatefulSet)
-}
-
 // CalculateStatefulSetSpecHash returns a hash of the statefulset.Spec.
 func CalculateStatefulSetSpecHash(statefulset *appsv1.StatefulSet) (string, error) {
 
diff --git a/pkg/operator/hive/apply.go b/pkg/operator/hive/apply.go
@@ -18,13 +18,13 @@ import (
 	"github.com/openshift/hive/pkg/util/scheme"
 )
 
-// RTOApplyOpt (runtime.Object apply option) modifies a runtime.Object in preparation for applying it.
-type RTOApplyOpt func(runtime.Object, log.FieldLogger) error
+// rtoApplyOpt (runtime.Object apply option) modifies a runtime.Object in preparation for applying it.
+type rtoApplyOpt func(runtime.Object, log.FieldLogger) error
 
-// WithGarbageCollection returns a RTOApplyOpt that adds an owner reference to parent to the
+// withGarbageCollection returns a RTOApplyOpt that adds an owner reference to parent to the
 // runtime object so the latter gets cleaned up when the parent is deleted. Errors only happen
 // if the runtime object can't be interpreted as a metav1.Object or meta.Type.
-func WithGarbageCollection(parent v1.Object) RTOApplyOpt {
+func withGarbageCollection(parent v1.Object) rtoApplyOpt {
 	return func(runtimeObj runtime.Object, hLog log.FieldLogger) error {
 		obj, err := meta.Accessor(runtimeObj)
 		if err != nil {
@@ -52,9 +52,9 @@ func WithGarbageCollection(parent v1.Object) RTOApplyOpt {
 	}
 }
 
-// WithNamespaceOverride returns a RTOApplyOpt that sets the namespace of the runtime object.
+// withNamespaceOverride returns a RTOApplyOpt that sets the namespace of the runtime object.
 // There are no error cases.
-func WithNamespaceOverride(namespaceOverride string) RTOApplyOpt {
+func withNamespaceOverride(namespaceOverride string) rtoApplyOpt {
 	return func(runtimeObj runtime.Object, hLog log.FieldLogger) error {
 		obj, err := meta.Accessor(runtimeObj)
 		if err != nil {
@@ -66,11 +66,11 @@ func WithNamespaceOverride(namespaceOverride string) RTOApplyOpt {
 	}
 }
 
-// CRBWithSubjectNSOverride sets the namespace of each Subject to namespaceOverride if it is
+// crbWithSubjectNSOverride sets the namespace of each Subject to namespaceOverride if it is
 // - a ServiceAccount subject
 // - otherwise unset
 // Errors if the runtime object is not a *ClusterRoleBinding
-func CRBWithSubjectNSOverride(namespaceOverride string) RTOApplyOpt {
+func crbWithSubjectNSOverride(namespaceOverride string) rtoApplyOpt {
 	return func(rto runtime.Object, hLog log.FieldLogger) error {
 		rb, ok := rto.(*rbacv1.ClusterRoleBinding)
 		if !ok {
@@ -85,49 +85,49 @@ func CRBWithSubjectNSOverride(namespaceOverride string) RTOApplyOpt {
 	}
 }
 
-// ToRuntimeObject defines a function that produces a runtime object. It is intended for use
+// toRuntimeObject defines a function that produces a runtime object. It is intended for use
 // in closures to supply such objects from different sources (asset paths, byte arrays) to
 // ApplyRuntimeObject().
-type ToRuntimeObject func(log.FieldLogger) (runtime.Object, error)
+type toRuntimeObject func(log.FieldLogger) (runtime.Object, error)
 
-// Passthrough's func just returns the input runtime object.
-func Passthrough(rto runtime.Object) ToRuntimeObject {
+// passthrough's func just returns the input runtime object.
+func passthrough(rto runtime.Object) toRuntimeObject {
 	return func(fl log.FieldLogger) (runtime.Object, error) {
 		return rto, nil
 	}
 }
 
-// FromAssetPath's func loads a runtime object from a known asset path in bindata.
-func FromAssetPath(assetPath string) ToRuntimeObject {
+// fromAssetPath's func loads a runtime object from a known asset path in bindata.
+func fromAssetPath(assetPath string) toRuntimeObject {
 	return func(hLog log.FieldLogger) (runtime.Object, error) {
 		hLog.WithField("assetPath", assetPath).Info("loading runtime object from asset")
 		return readRuntimeObject(assetPath)
 	}
 }
 
-// CRBFromAssetPath is a special case of FromAssetPath that returns a *ClusterRoleBinding
+// crbFromAssetPath is a special case of FromAssetPath that returns a *ClusterRoleBinding
 // (a specific instance of a runtime object) from a known asset path in bindata. Panics if
 // the asset is not a CRB, or if the asset can't be loaded from the specified path.
-func CRBFromAssetPath(roleBindingAssetPath string) ToRuntimeObject {
+func crbFromAssetPath(roleBindingAssetPath string) toRuntimeObject {
 	return func(hLog log.FieldLogger) (runtime.Object, error) {
 		hLog.WithField("assetPath", roleBindingAssetPath).Info("loading ClusterRoleBinding from asset")
 		return resourceread.ReadClusterRoleBindingV1OrDie(assets.MustAsset(roleBindingAssetPath)), nil
 	}
 }
 
-// FromBytes produces a func that decodes a byte array into a runtime object.
-func FromBytes(assetBytes []byte) ToRuntimeObject {
+// fromBytes produces a func that decodes a byte array into a runtime object.
+func fromBytes(assetBytes []byte) toRuntimeObject {
 	return func(hLog log.FieldLogger) (runtime.Object, error) {
 		hLog.Info("decoding runtime object from bytes")
 		return decodeRuntimeObject(assetBytes)
 	}
 }
 
-// ApplyRuntimeObject
+// applyRuntimeObject
 // - Executes rtoFactory to produce a runtime object.
 // - Modifies the runtime object according to opts.
 // - Applies the runtime object to the cluster via h.
-func ApplyRuntimeObject(h resource.Helper, rtoFactory ToRuntimeObject, hLog log.FieldLogger, opts ...RTOApplyOpt) (resource.ApplyResult, error) {
+func applyRuntimeObject(h resource.Helper, rtoFactory toRuntimeObject, hLog log.FieldLogger, opts ...rtoApplyOpt) (resource.ApplyResult, error) {
 	requiredObj, err := rtoFactory(hLog)
 	if err != nil {
 		hLog.WithError(err).Error("failed to convert to runtime object")
@@ -142,23 +142,23 @@ func ApplyRuntimeObject(h resource.Helper, rtoFactory ToRuntimeObject, hLog log.
 	return h.ApplyRuntimeObject(requiredObj, scheme.GetScheme())
 }
 
-func DeleteAssetByPathWithNSOverride(h resource.Helper, assetPath, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
+func deleteAssetByPathWithNSOverride(h resource.Helper, assetPath, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
 	requiredObj, err := readRuntimeObject(assetPath)
 	if err != nil {
 		return errors.Wrapf(err, "unable to decode asset: %s", assetPath)
 	}
-	return DeleteRuntimeObjectWithNSOverride(h, requiredObj, namespaceOverride, hiveconfig)
+	return deleteRuntimeObjectWithNSOverride(h, requiredObj, namespaceOverride, hiveconfig)
 }
 
-func DeleteAssetBytesWithNSOverride(h resource.Helper, assetBytes []byte, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
+func deleteAssetBytesWithNSOverride(h resource.Helper, assetBytes []byte, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
 	rtObj, err := decodeRuntimeObject(assetBytes)
 	if err != nil {
 		return errors.Wrap(err, "unable to decode asset")
 	}
-	return DeleteRuntimeObjectWithNSOverride(h, rtObj, namespaceOverride, hiveconfig)
+	return deleteRuntimeObjectWithNSOverride(h, rtObj, namespaceOverride, hiveconfig)
 }
 
-func DeleteRuntimeObjectWithNSOverride(h resource.Helper, requiredObj runtime.Object, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
+func deleteRuntimeObjectWithNSOverride(h resource.Helper, requiredObj runtime.Object, namespaceOverride string, hiveconfig *hivev1.HiveConfig) error {
 	objA, _ := meta.Accessor(requiredObj)
 	objT, _ := meta.TypeAccessor(requiredObj)
 	if err := h.Delete(objT.GetAPIVersion(), objT.GetKind(), namespaceOverride, objA.GetName()); err != nil {
diff --git a/pkg/operator/hive/configmap.go b/pkg/operator/hive/configmap.go
@@ -339,7 +339,7 @@ func (r *ReconcileHiveConfig) deployConfigMap(hLog log.FieldLogger, h resource.H
 		}
 	}
 
-	result, err := ApplyRuntimeObject(h, Passthrough(cm), hLog, WithGarbageCollection(instance))
+	result, err := applyRuntimeObject(h, passthrough(cm), hLog, withGarbageCollection(instance))
 	if err != nil {
 		cmLog.WithError(err).Error("error applying configmap")
 		return "", err
diff --git a/pkg/operator/hive/hive.go b/pkg/operator/hive/hive.go
@@ -64,7 +64,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 		for _, asset := range assetsToClean {
 			hLog.Infof("Deleting asset %s from old target namespace %s", asset, ns)
 			// DeleteAssetWithNSOverride already no-ops for IsNotFound
-			if err := DeleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {
+			if err := deleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {
 				return errors.Wrapf(err, "error deleting asset %s from old target namespace %s", asset, ns)
 			}
 		}
@@ -298,7 +298,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 
 	// Load namespaced assets, decode them, set to our target namespace, and apply:
 	for _, assetPath := range namespacedAssets {
-		if _, err := ApplyRuntimeObject(h, FromAssetPath(assetPath), hLog, WithNamespaceOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, fromAssetPath(assetPath), hLog, withNamespaceOverride(hiveNSName), withGarbageCollection(instance)); err != nil {
 			hLog.WithError(err).Error("error applying object with namespace override")
 			return err
 		}
@@ -311,7 +311,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 		"config/controllers/hive_controllers_role.yaml",
 	}
 	for _, a := range applyAssets {
-		if _, err := ApplyRuntimeObject(h, FromAssetPath(a), hLog, WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, fromAssetPath(a), hLog, withGarbageCollection(instance)); err != nil {
 			hLog.WithField("asset", a).WithError(err).Error("error applying asset")
 			return err
 		}
@@ -324,7 +324,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 	}
 	for _, crbAsset := range clusterRoleBindingAssets {
 
-		if _, err := ApplyRuntimeObject(h, CRBFromAssetPath(crbAsset), hLog, CRBWithSubjectNSOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, crbFromAssetPath(crbAsset), hLog, crbWithSubjectNSOverride(hiveNSName), withGarbageCollection(instance)); err != nil {
 			hLog.WithError(err).Error("error applying ClusterRoleBinding with namespace override")
 			return err
 		}
@@ -345,7 +345,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 	if r.isOpenShift {
 		hLog.Info("deploying OpenShift specific assets")
 		for _, a := range openshiftSpecificAssets {
-			_, err = ApplyRuntimeObject(h, FromAssetPath(a), hLog, WithGarbageCollection(instance))
+			_, err = applyRuntimeObject(h, fromAssetPath(a), hLog, withGarbageCollection(instance))
 			if err != nil {
 				return err
 			}
@@ -362,7 +362,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper
 	}
 
 	hiveDeployment.Namespace = hiveNSName
-	result, err := ApplyRuntimeObject(h, Passthrough(hiveDeployment), hLog, WithGarbageCollection(instance))
+	result, err := applyRuntimeObject(h, passthrough(hiveDeployment), hLog, withGarbageCollection(instance))
 	if err != nil {
 		hLog.WithError(err).Error("error applying deployment")
 		return err
@@ -425,7 +425,7 @@ func (r *ReconcileHiveConfig) includeAdditionalCAs(hLog log.FieldLogger, h resou
 			"ca.crt": additionalCA.Bytes(),
 		},
 	}
-	result, err := ApplyRuntimeObject(h, Passthrough(caSecret), hLog, WithGarbageCollection(instance))
+	result, err := applyRuntimeObject(h, passthrough(caSecret), hLog, withGarbageCollection(instance))
 	if err != nil {
 		hLog.WithError(err).Error("error applying additional cert secret")
 		return err
diff --git a/pkg/operator/hive/hiveadmission.go b/pkg/operator/hive/hiveadmission.go
@@ -12,15 +12,12 @@ import (
 	controllerutils "github.com/openshift/hive/pkg/controller/utils"
 	"github.com/openshift/hive/pkg/operator/assets"
 	"github.com/openshift/hive/pkg/resource"
-	"github.com/openshift/hive/pkg/util/scheme"
 
 	"github.com/openshift/library-go/pkg/operator/resource/resourceread"
 
 	admregv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/types"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 )
@@ -73,7 +70,7 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 		for _, asset := range assetsToClean {
 			hLog.Infof("Deleting asset %s from old target namespace %s", asset, ns)
 			// DeleteAssetWithNSOverride already no-ops for IsNotFound
-			if err := DeleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {
+			if err := deleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {
 				return errors.Wrapf(err, "error deleting asset %s from old target namespace %s", asset, ns)
 			}
 		}
@@ -83,7 +80,7 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 
 	// Load namespaced assets, decode them, set to our target namespace, and apply:
 	for _, assetPath := range namespacedAssets {
-		if _, err := ApplyRuntimeObject(h, FromAssetPath(assetPath), hLog, WithNamespaceOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, fromAssetPath(assetPath), hLog, withNamespaceOverride(hiveNSName), withGarbageCollection(instance)); err != nil {
 			hLog.WithError(err).Error("error applying object with namespace override")
 			return err
 		}
@@ -95,7 +92,7 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 		"config/hiveadmission/hiveadmission_rbac_role.yaml",
 	}
 	for _, a := range applyAssets {
-		if _, err := ApplyRuntimeObject(h, FromAssetPath(a), hLog, WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, fromAssetPath(a), hLog, withGarbageCollection(instance)); err != nil {
 			return err
 		}
 	}
@@ -105,7 +102,7 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 		"config/hiveadmission/hiveadmission_rbac_role_binding.yaml",
 	}
 	for _, crbAsset := range clusterRoleBindingAssets {
-		if _, err := ApplyRuntimeObject(h, CRBFromAssetPath(crbAsset), hLog, CRBWithSubjectNSOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {
+		if _, err := applyRuntimeObject(h, crbFromAssetPath(crbAsset), hLog, crbWithSubjectNSOverride(hiveNSName), withGarbageCollection(instance)); err != nil {
 			hLog.WithError(err).Error("error applying ClusterRoleBinding with namespace override")
 			return err
 		}
@@ -153,31 +150,15 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 	addConfigVolume(&hiveAdmDeployment.Spec.Template.Spec, r.supportedContractsConfigMapInfo(hLog), hiveAdmContainer)
 	addReleaseImageVerificationConfigMapEnv(hiveAdmContainer, instance)
 
-	scheme := scheme.GetScheme()
-
 	validatingWebhooks := make([]*admregv1.ValidatingWebhookConfiguration, len(webhookAssets))
 	for i, yaml := range webhookAssets {
-		requiredObj, err := runtime.Decode(
-			serializer.NewCodecFactory(scheme).
-				UniversalDecoder(admregv1.SchemeGroupVersion), assets.MustAsset(yaml))
-		if err != nil {
-			panic(err)
-		}
-
-		wh := requiredObj.(*admregv1.ValidatingWebhookConfiguration)
-		validatingWebhooks[i] = wh
+		validatingWebhooks[i] = readRuntimeObjectOrDie[*admregv1.ValidatingWebhookConfiguration](
+			admregv1.SchemeGroupVersion, assets.MustAsset(yaml))
 	}
 
 	hLog.Debug("reading apiservice")
-
-	requiredObj, err := runtime.Decode(
-		serializer.NewCodecFactory(scheme).
-			UniversalDecoder(
-				apiregistrationv1.SchemeGroupVersion), assets.MustAsset("config/hiveadmission/apiservice.yaml"))
-	if err != nil {
-		panic(err)
-	}
-	apiService := requiredObj.(*apiregistrationv1.APIService)
+	apiService := readRuntimeObjectOrDie[*apiregistrationv1.APIService](
+		apiregistrationv1.SchemeGroupVersion, assets.MustAsset("config/hiveadmission/apiservice.yaml"))
 	apiService.Spec.Service.Namespace = hiveNSName
 
 	err = r.injectCerts(apiService, validatingWebhooks, nil, hiveNSName, hLog)
@@ -207,22 +188,22 @@ func (r *ReconcileHiveConfig) deployHiveAdmission(hLog log.FieldLogger, h resour
 		hiveAdmDeployment.Spec.Template.Spec.ImagePullSecrets = append(hiveAdmDeployment.Spec.Template.Spec.ImagePullSecrets, *ref)
 	}
 
-	result, err := ApplyRuntimeObject(h, Passthrough(hiveAdmDeployment), hLog, WithGarbageCollection(instance))
+	result, err := applyRuntimeObject(h, passthrough(hiveAdmDeployment), hLog, withGarbageCollection(instance))
 	if err != nil {
 		hLog.WithError(err).Error("error applying deployment")
 		return err
 	}
 	hLog.WithField("result", result).Info("hiveadmission deployment applied")
 
-	result, err = ApplyRuntimeObject(h, Passthrough(apiService), hLog, WithGarbageCollection(instance))
+	result, err = applyRuntimeObject(h, passthrough(apiService), hLog, withGarbageCollection(instance))
 	if err != nil {
 		hLog.WithError(err).Error("error applying apiservice")
 		return err
 	}
 	hLog.Infof("apiservice applied (%s)", result)
 
 	for _, webhook := range validatingWebhooks {
-		result, err = ApplyRuntimeObject(h, Passthrough(webhook), hLog, WithGarbageCollection(instance))
+		result, err = applyRuntimeObject(h, passthrough(webhook), hLog, withGarbageCollection(instance))
 		if err != nil {
 			hLog.WithField("webhook", webhook.Name).WithError(err).Errorf("error applying validating webhook")
 			return err
diff --git a/pkg/operator/hive/operatorutils.go b/pkg/operator/hive/operatorutils.go
@@ -11,14 +11,19 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/dynamic"
 
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 	"github.com/openshift/hive/pkg/constants"
 	controllerutils "github.com/openshift/hive/pkg/controller/utils"
+	"github.com/openshift/hive/pkg/util/scheme"
 )
 
+var appsCodecs = serializer.NewCodecFactory(scheme.GetScheme())
+
 func GetHiveNamespace(config *hivev1.HiveConfig) string {
 	if config.Spec.TargetNamespace == "" {
 		return constants.DefaultHiveNamespace
@@ -95,3 +100,12 @@ func getImagePullSecretReference(config *hivev1.HiveConfig) *corev1.LocalObjectR
 	}
 	return nil
 }
+
+func readRuntimeObjectOrDie[T any](sgv schema.GroupVersion, objBytes []byte) T {
+	requiredObj, err := runtime.Decode(appsCodecs.UniversalDecoder(sgv), objBytes)
+	if err != nil {
+		panic(err)
+	}
+	return requiredObj.(T)
+
+}
diff --git a/pkg/operator/hive/sharded_controllers.go b/pkg/operator/hive/sharded_controllers.go

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ func (r *ReconcileHiveConfig) deployConfigMap(hLog log.FieldLogger, h resource.H`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
`342`		`- result, err := ApplyRuntimeObject(h, Passthrough(cm), hLog, WithGarbageCollection(instance))`
	`342`	`+ result, err := applyRuntimeObject(h, passthrough(cm), hLog, withGarbageCollection(instance))`
`343`	`343`	`if err != nil {`
`344`	`344`	`cmLog.WithError(err).Error("error applying configmap")`
`345`	`345`	`return "", err`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`64`	`64`	`for _, asset := range assetsToClean {`
`65`	`65`	`hLog.Infof("Deleting asset %s from old target namespace %s", asset, ns)`
`66`	`66`	`// DeleteAssetWithNSOverride already no-ops for IsNotFound`
`67`		`- if err := DeleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {`
	`67`	`+ if err := deleteAssetByPathWithNSOverride(h, asset, ns, instance); err != nil {`
`68`	`68`	`return errors.Wrapf(err, "error deleting asset %s from old target namespace %s", asset, ns)`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -298,7 +298,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`298`	`298`
`299`	`299`	`// Load namespaced assets, decode them, set to our target namespace, and apply:`
`300`	`300`	`for _, assetPath := range namespacedAssets {`
`301`		`- if _, err := ApplyRuntimeObject(h, FromAssetPath(assetPath), hLog, WithNamespaceOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {`
	`301`	`+ if _, err := applyRuntimeObject(h, fromAssetPath(assetPath), hLog, withNamespaceOverride(hiveNSName), withGarbageCollection(instance)); err != nil {`
`302`	`302`	`hLog.WithError(err).Error("error applying object with namespace override")`
`303`	`303`	`return err`
`304`	`304`	`}`
`@@ -311,7 +311,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`311`	`311`	`"config/controllers/hive_controllers_role.yaml",`
`312`	`312`	`}`
`313`	`313`	`for _, a := range applyAssets {`
`314`		`- if _, err := ApplyRuntimeObject(h, FromAssetPath(a), hLog, WithGarbageCollection(instance)); err != nil {`
	`314`	`+ if _, err := applyRuntimeObject(h, fromAssetPath(a), hLog, withGarbageCollection(instance)); err != nil {`
`315`	`315`	`hLog.WithField("asset", a).WithError(err).Error("error applying asset")`
`316`	`316`	`return err`
`317`	`317`	`}`
`@@ -324,7 +324,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`324`	`324`	`}`
`325`	`325`	`for _, crbAsset := range clusterRoleBindingAssets {`
`326`	`326`
`327`		`- if _, err := ApplyRuntimeObject(h, CRBFromAssetPath(crbAsset), hLog, CRBWithSubjectNSOverride(hiveNSName), WithGarbageCollection(instance)); err != nil {`
	`327`	`+ if _, err := applyRuntimeObject(h, crbFromAssetPath(crbAsset), hLog, crbWithSubjectNSOverride(hiveNSName), withGarbageCollection(instance)); err != nil {`
`328`	`328`	`hLog.WithError(err).Error("error applying ClusterRoleBinding with namespace override")`
`329`	`329`	`return err`
`330`	`330`	`}`
`@@ -345,7 +345,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`345`	`345`	`if r.isOpenShift {`
`346`	`346`	`hLog.Info("deploying OpenShift specific assets")`
`347`	`347`	`for _, a := range openshiftSpecificAssets {`
`348`		`- _, err = ApplyRuntimeObject(h, FromAssetPath(a), hLog, WithGarbageCollection(instance))`
	`348`	`+ _, err = applyRuntimeObject(h, fromAssetPath(a), hLog, withGarbageCollection(instance))`
`349`	`349`	`if err != nil {`
`350`	`350`	`return err`
`351`	`351`	`}`
`@@ -362,7 +362,7 @@ func (r *ReconcileHiveConfig) deployHive(hLog log.FieldLogger, h resource.Helper`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`hiveDeployment.Namespace = hiveNSName`
`365`		`- result, err := ApplyRuntimeObject(h, Passthrough(hiveDeployment), hLog, WithGarbageCollection(instance))`
	`365`	`+ result, err := applyRuntimeObject(h, passthrough(hiveDeployment), hLog, withGarbageCollection(instance))`
`366`	`366`	`if err != nil {`
`367`	`367`	`hLog.WithError(err).Error("error applying deployment")`
`368`	`368`	`return err`
`@@ -425,7 +425,7 @@ func (r *ReconcileHiveConfig) includeAdditionalCAs(hLog log.FieldLogger, h resou`
`425`	`425`	`"ca.crt": additionalCA.Bytes(),`
`426`	`426`	`},`
`427`	`427`	`}`
`428`		`- result, err := ApplyRuntimeObject(h, Passthrough(caSecret), hLog, WithGarbageCollection(instance))`
	`428`	`+ result, err := applyRuntimeObject(h, passthrough(caSecret), hLog, withGarbageCollection(instance))`
`429`	`429`	`if err != nil {`
`430`	`430`	`hLog.WithError(err).Error("error applying additional cert secret")`
`431`	`431`	`return err`