Rename new option to SkipPrimaryGVKSchemeRegistration

pkg/reconciler/reconciler.go

@@ -78,7 +78,7 @@ type Reconciler struct {
 	maxConcurrentReconciles          int
 	reconcilePeriod                  time.Duration
 	maxHistory                       int
-	skipGenericGVKSchemeRegistration bool
+	skipPrimaryGVKSchemeRegistration bool
 
 	annotSetupOnce       sync.Once
 	annotations          map[string]struct{}
@@ -132,7 +132,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	controllerName := fmt.Sprintf("%v-controller", strings.ToLower(r.gvk.Kind))
 
 	r.addDefaults(mgr, controllerName)
-	if !r.skipGenericGVKSchemeRegistration {
+	if !r.skipPrimaryGVKSchemeRegistration {
 		r.setupScheme(mgr)
 	}
 
@@ -260,7 +260,7 @@ func SkipDependentWatches(skip bool) Option {
 	}
 }
 
-// SkipGenericGVKSchemeRegistration is an Option that allows to disable the default behaviour of
+// SkipPrimaryGVKSchemeRegistration is an Option that allows to disable the default behaviour of
 // registering unstructured.Unstructured as underlying type for the GVK scheme.
 //
 // Disabling this built-in registration is necessary when building operators
@@ -290,7 +290,7 @@ func SkipDependentWatches(skip bool) Option {
 //   // Create reconciler with generic scheme registration being disabled.
 //   r, err := reconciler.New(
 //     reconciler.WithChart(chart),
-//     reconciler.SkipGenericGVKSchemeRegistration(true),
+//     reconciler.SkipPrimaryGVKSchemeRegistration(true),
 //     // [...]
 //   )
 //
@@ -299,9 +299,9 @@ func SkipDependentWatches(skip bool) Option {
 //
 // By default, skipping of the generic scheme setup is disabled, which means that
 // unstructured.Unstructured is used for the GVK scheme.
-func SkipGenericGVKSchemeRegistration(skip bool) Option {
+func SkipPrimaryGVKSchemeRegistration(skip bool) Option {
 	return func(r *Reconciler) error {
-		r.skipGenericGVKSchemeRegistration = skip
+		r.skipPrimaryGVKSchemeRegistration = skip
 		return nil
 	}
 }

pkg/reconciler/reconciler_test.go

@@ -494,7 +494,7 @@ var _ = Describe("Reconciler", func() {
 						WithOverrideValues(map[string]string{
 							"image.repository": "custom-nginx",
 						}),
-						SkipGenericGVKSchemeRegistration(true),
+						SkipPrimaryGVKSchemeRegistration(true),
 					)
 				} else {
 					// Default behaviour using generic GVK scheme based on unstructured.Unstructured