Fix SA1019: server-side apply required, needs generated apply configurations

Author: camilamacedo86

internal/operator-controller/applier/boxcutter.go

@@ -439,37 +439,18 @@ func (bc *Boxcutter) createOrUpdate(ctx context.Context, user user.Info, rev *oc
 		return err
 	}
 
-	// DEPRECATION NOTICE: Using client.Apply (deprecated in controller-runtime v0.23.0+)
-	//
-	// WHY WE CAN'T FIX THIS YET:
-	// The recommended replacement is the new typed Apply() method that requires generated
-	// apply configurations (ApplyConfiguration types). However, this project does not
-	// currently generate these apply configurations for its API types.
-	//
-	// WHY WE NEED SERVER-SIDE APPLY SEMANTICS:
-	// This controller requires server-side apply with field ownership management to:
-	// 1. Track which controller owns which fields (via client.FieldOwner)
-	// 2. Take ownership of fields from other managers during upgrades (via client.ForceOwnership)
-	// 3. Automatically create-or-update without explicit Get/Create/Update logic
-	//
-	// WHY ALTERNATIVES DON'T WORK:
-	// - client.MergeFrom(): Lacks field ownership - causes conflicts during controller upgrades
-	// - client.StrategicMergePatch(): No field management - upgrade tests fail with ownership errors
-	// - Manual Create/Update: Loses server-side apply benefits, complex to implement correctly
-	//
-	// WHAT'S REQUIRED TO FIX PROPERLY:
-	// 1. Generate apply configurations for all API types (ClusterExtensionRevision, etc.)
-	//    - Requires running controller-gen with --with-applyconfig flag
-	//    - Generates ClusterExtensionRevisionApplyConfiguration types
-	// 2. Update all resource creation/update code to use typed Apply methods
-	// 3. Update all tests to work with new patterns
-	// This is a project-wide effort beyond the scope of the k8s v1.35 upgrade.
-	//
-	// MIGRATION PATH:
-	// Track in a future issue: "Generate apply configurations and migrate to typed Apply methods"
-	//
-	// nolint:staticcheck // SA1019: server-side apply required, needs generated apply configurations
-	return bc.Client.Patch(ctx, rev, client.Apply, client.FieldOwner(bc.FieldOwner), client.ForceOwnership)
+	// Convert the revision to an unstructured object to create an apply configuration.
+	// This allows us to use Server-Side Apply without needing generated apply types.
+	unstructuredRev, err := runtime.DefaultUnstructuredConverter.ToUnstructured(rev)
+	if err != nil {
+		return fmt.Errorf("converting ClusterExtensionRevision to unstructured: %w", err)
+	}
+	u := &unstructured.Unstructured{Object: unstructuredRev}
+	applyConfig := client.ApplyConfigurationFromUnstructured(u)
+
+	// Apply the revision using Server-Side Apply with field ownership to handle
+	// field conflicts during OLM upgrades.
+	return bc.Client.Apply(ctx, applyConfig, client.FieldOwner(bc.FieldOwner), client.ForceOwnership)
 }
 
 func (bc *Boxcutter) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1.ClusterExtension, objectLabels, revisionAnnotations map[string]string) (bool, string, error) {

internal/operator-controller/applier/boxcutter_test.go

@@ -2,6 +2,7 @@ package applier_test
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -564,6 +565,24 @@ func TestBoxcutter_Apply(t *testing.T) {
 				}
 				return client.Patch(ctx, obj, patch, opts...)
 			},
+			Apply: func(ctx context.Context, client client.WithWatch, obj runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
+				// Extract revision number from apply configuration to validate it matches expected value
+				cer := &ocv1.ClusterExtensionRevision{}
+				data, err := json.Marshal(obj)
+				if err != nil {
+					return fmt.Errorf("failed to marshal apply configuration: %w", err)
+				}
+				if err := json.Unmarshal(data, cer); err != nil {
+					return fmt.Errorf("failed to unmarshal to ClusterExtensionRevision: %w", err)
+				}
+
+				fmt.Println(cer.Spec.Revision)
+				if cer.Spec.Revision != revNum {
+					fmt.Println("AAA")
+					return apierrors.NewInvalid(cer.GroupVersionKind().GroupKind(), cer.GetName(), field.ErrorList{field.Invalid(field.NewPath("spec.phases"), "immutable", "spec.phases is immutable")})
+				}
+				return client.Apply(ctx, obj, opts...)
+			},
 		}
 	}
 	testCases := []struct {