From 8e39443b44c9449c628723369d3b7293cb4b4cb2 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 14 Feb 2024 10:51:19 -0500 Subject: [PATCH] fixup! :sparkles: Plumb the Extension API Signed-off-by: Todd Short --- cmd/manager/main.go | 2 +- internal/controllers/extension_controller.go | 2 +- pkg/features/features.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 85b60bb20..046e4256b 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -123,7 +123,7 @@ func main() { setupLog.Error(err, "unable to create controller", "controller", "ClusterExtension") os.Exit(1) } - if features.OperatorControllerFeatureGate.Enabled(features.EnableExtensionApi) { + if features.OperatorControllerFeatureGate.Enabled(features.EnableExtensionAPI) { if err = (&controllers.ExtensionReconciler{ Client: cl, BundleProvider: catalogClient, diff --git a/internal/controllers/extension_controller.go b/internal/controllers/extension_controller.go index fe03a17ab..37d9018c3 100644 --- a/internal/controllers/extension_controller.go +++ b/internal/controllers/extension_controller.go @@ -102,7 +102,7 @@ func (*ExtensionReconciler) checkForUnexpectedFieldChange(a, b ocv1alpha1.Extens // to return different results (e.g. requeue). // //nolint:unparam -func (r *ExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alpha1.Extension) (ctrl.Result, error) { +func (r *ExtensionReconciler) reconcile(_ context.Context, ext *ocv1alpha1.Extension) (ctrl.Result, error) { // Don't do anything if Paused if ext.Spec.Managed == ocv1alpha1.ManagedStatePaused { return ctrl.Result{}, nil diff --git a/pkg/features/features.go b/pkg/features/features.go index 24b99b0ae..e930fbbaa 100644 --- a/pkg/features/features.go +++ b/pkg/features/features.go @@ -10,7 +10,7 @@ const ( // Ex: SomeFeature featuregate.Feature = "SomeFeature" ForceSemverUpgradeConstraints featuregate.Feature = "ForceSemverUpgradeConstraints" - EnableExtensionApi featuregate.Feature = "EnableExtensionApi" + EnableExtensionAPI featuregate.Feature = "EnableExtensionApi" ) var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ @@ -18,7 +18,7 @@ var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.Feature // Ex: SomeFeature: {...} ForceSemverUpgradeConstraints: {Default: false, PreRelease: featuregate.Alpha}, - EnableExtensionApi: {Default: false, PreRelease: featuregate.Alpha}, + EnableExtensionAPI: {Default: false, PreRelease: featuregate.Alpha}, } var OperatorControllerFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()