Refactor the test cases for sinkbindingselectionmode

go.mod

@@ -21,11 +21,11 @@ require (
 	k8s.io/client-go v0.33.1
 	k8s.io/code-generator v0.33.1
 	knative.dev/caching v0.0.0-20250708014010-99e6352a57b1
-	knative.dev/eventing v0.45.1-0.20250709065003-351613bc3192
+	knative.dev/eventing v0.45.1-0.20250711181006-6e5cb3a209fd
 	knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba
 	knative.dev/pkg v0.0.0-20250710001404-a4cc1bdef5b2
 	knative.dev/reconciler-test v0.0.0-20250708152404-d97d9007b8d3
-	knative.dev/serving v0.45.1-0.20250710161811-c65e780e017d
+	knative.dev/serving v0.45.1-0.20250711172906-bf962e6184a3
 	sigs.k8s.io/yaml v1.5.0
 )
 

go.sum

@@ -1731,8 +1731,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 knative.dev/caching v0.0.0-20250708014010-99e6352a57b1 h1:XwdZn/BhNpy0Gfo9kd4JH5UDqcKmNGsUhEgcbKC+4yw=
 knative.dev/caching v0.0.0-20250708014010-99e6352a57b1/go.mod h1:h2I9IN6loLDQ6uUEpK20tlBds/xqeNfgW6uF5RDeBgk=
-knative.dev/eventing v0.45.1-0.20250709065003-351613bc3192 h1:w7RqueP9vzi4kovE+CbtZlXMUXkAoEJ3xVNzmY1Mdi8=
-knative.dev/eventing v0.45.1-0.20250709065003-351613bc3192/go.mod h1:CzplbX3BjQ/1glhP1XL20baAttmcZCDd8q9Jg3TwzwY=
+knative.dev/eventing v0.45.1-0.20250711181006-6e5cb3a209fd h1:I8pBHMWNBU7jZcqy7TxwO0s8icSjLdTyeOETPhjg6fY=
+knative.dev/eventing v0.45.1-0.20250711181006-6e5cb3a209fd/go.mod h1:vSKbqlM8umqDpNr7zXdcfjPO/01oA43wL64cIz1RExE=
 knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba h1:PkOTBI8DRfvUKD8HTvYYT94NJ49J++llrDo3y0/ZAwc=
 knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
 knative.dev/networking v0.0.0-20250708014646-f8c92385906a h1:svYrI9zSPhZXNdQ3Id5syQAuZvpIevBOCPfUN6lWjso=
@@ -1741,8 +1741,8 @@ knative.dev/pkg v0.0.0-20250710001404-a4cc1bdef5b2 h1:PH7kUY1glZNfo2aUp+rEsoWUeN
 knative.dev/pkg v0.0.0-20250710001404-a4cc1bdef5b2/go.mod h1:I2vWm0knRQH2WBfpIAkRzOPk0XoXxfu8YJT63ddYWd4=
 knative.dev/reconciler-test v0.0.0-20250708152404-d97d9007b8d3 h1:IoFGGv7wWIHRJ5vPkcKCII9MMQEJ/ARUp1qZg7QdfLA=
 knative.dev/reconciler-test v0.0.0-20250708152404-d97d9007b8d3/go.mod h1:5PaPJka37JwlDQUQD3yHpHZLs0BOW8Ahz3mRNgXeoqw=
-knative.dev/serving v0.45.1-0.20250710161811-c65e780e017d h1:bAKkcS8A6DYNrfzY8WCFuxR5Lh9ST5dB/YIpTXHAMbE=
-knative.dev/serving v0.45.1-0.20250710161811-c65e780e017d/go.mod h1:hXjH0XGC1ISNiXcIcVlbGqMfib7CJgZ1HT7phnykG1E=
+knative.dev/serving v0.45.1-0.20250711172906-bf962e6184a3 h1:YkcdrQhc9xIDOGR61gqrPU7xFmMRWC1/mzZnfCgx3Ac=
+knative.dev/serving v0.45.1-0.20250711172906-bf962e6184a3/go.mod h1:BSErp36ryheao9WJuYOWSZDcqaK3sgXbBIyN4jngubY=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
 pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=

pkg/reconciler/common/base_reconciler.go

@@ -0,0 +1,74 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package common
+
+import (
+	"context"
+
+	mf "github.com/manifestival/manifestival"
+	"knative.dev/pkg/logging"
+	pkgreconciler "knative.dev/pkg/reconciler"
+
+	"knative.dev/operator/pkg/apis/operator/base"
+)
+
+// BaseReconciler provides common functionality for component reconcilers
+type BaseReconciler struct {
+	manifest  mf.Manifest
+	extension Extension
+}
+
+// NewBaseReconciler creates a new base reconciler
+func NewBaseReconciler(manifest mf.Manifest, extension Extension) *BaseReconciler {
+	return &BaseReconciler{
+		manifest:  manifest,
+		extension: extension,
+	}
+}
+
+// ReconcileComponent provides the common reconciliation logic for components
+func (r *BaseReconciler) ReconcileComponent(ctx context.Context, instance base.KComponent, stages Stages) pkgreconciler.Event {
+	logger := logging.FromContext(ctx)
+
+	// Note: InitializeConditions and SetObservedGeneration are specific to each component type
+	// and should be called by the concrete reconciler implementations
+
+	logger.Infow("Reconciling component", "status", instance.GetStatus())
+
+	if err := IsVersionValidMigrationEligible(instance); err != nil {
+		instance.GetStatus().MarkVersionMigrationNotEligible(err.Error())
+		return nil
+	}
+	instance.GetStatus().MarkVersionMigrationEligible()
+
+	if err := r.extension.Reconcile(ctx, instance); err != nil {
+		return err
+	}
+
+	manifest := r.manifest.Append()
+	return stages.Execute(ctx, &manifest, instance)
+}
+
+// GetManifest returns the base manifest
+func (r *BaseReconciler) GetManifest() mf.Manifest {
+	return r.manifest
+}
+
+// GetExtension returns the extension
+func (r *BaseReconciler) GetExtension() Extension {
+	return r.extension
+}

pkg/reconciler/common/resources.go

@@ -46,7 +46,7 @@ func ResourceRequirementsTransform(obj base.KComponent, log *zap.SugaredLogger)
 			containers := deployment.Spec.Template.Spec.Containers
 			resources := obj.GetSpec().GetResources()
 			for i := range containers {
-				if override := find(resources, containers[i].Name); override != nil {
+				if override := findResourceOverride(resources, containers[i].Name); override != nil {
 					merge(&override.Limits, &containers[i].Resources.Limits)
 					merge(&override.Requests, &containers[i].Resources.Requests)
 				}
@@ -71,7 +71,7 @@ func merge(src, tgt *v1.ResourceList) {
 	}
 }
 
-func find(resources []base.ResourceRequirementsOverride, name string) *base.ResourceRequirementsOverride {
+func findResourceOverride(resources []base.ResourceRequirementsOverride, name string) *base.ResourceRequirementsOverride {
 	for _, override := range resources {
 		if override.Container == name {
 			return &override

pkg/reconciler/common/workload_override.go

@@ -29,62 +29,139 @@ import (
 	"knative.dev/operator/pkg/apis/operator/base"
 )
 
+// resourceHandler defines the interface for handling different Kubernetes resource types
+type resourceHandler interface {
+	GetPodTemplateSpec() *corev1.PodTemplateSpec
+	SetReplicas(*int32)
+	GetObject() metav1.Object
+}
+
+// deploymentHandler implements resourceHandler for Deployments
+type deploymentHandler struct {
+	deployment *appsv1.Deployment
+}
+
+func (d *deploymentHandler) GetPodTemplateSpec() *corev1.PodTemplateSpec {
+	return &d.deployment.Spec.Template
+}
+
+func (d *deploymentHandler) SetReplicas(replicas *int32) {
+	d.deployment.Spec.Replicas = replicas
+}
+
+func (d *deploymentHandler) GetObject() metav1.Object {
+	return d.deployment
+}
+
+// statefulSetHandler implements resourceHandler for StatefulSets
+type statefulSetHandler struct {
+	statefulSet *appsv1.StatefulSet
+}
+
+func (s *statefulSetHandler) GetPodTemplateSpec() *corev1.PodTemplateSpec {
+	return &s.statefulSet.Spec.Template
+}
+
+func (s *statefulSetHandler) SetReplicas(replicas *int32) {
+	s.statefulSet.Spec.Replicas = replicas
+}
+
+func (s *statefulSetHandler) GetObject() metav1.Object {
+	return s.statefulSet
+}
+
+// jobHandler implements resourceHandler for Jobs
+type jobHandler struct {
+	job *batchv1.Job
+}
+
+func (j *jobHandler) GetPodTemplateSpec() *corev1.PodTemplateSpec {
+	return &j.job.Spec.Template
+}
+
+func (j *jobHandler) SetReplicas(replicas *int32) {
+	// Jobs don't have replicas, so this is a no-op
+}
+
+func (j *jobHandler) GetObject() metav1.Object {
+	return j.job
+}
+
+// createResourceHandler creates the appropriate resource handler based on the resource type
+func createResourceHandler(u *unstructured.Unstructured) (resourceHandler, error) {
+	switch u.GetKind() {
+	case "Deployment":
+		deployment := &appsv1.Deployment{}
+		if err := scheme.Scheme.Convert(u, deployment, nil); err != nil {
+			return nil, err
+		}
+		return &deploymentHandler{deployment: deployment}, nil
+	case "StatefulSet":
+		ss := &appsv1.StatefulSet{}
+		if err := scheme.Scheme.Convert(u, ss, nil); err != nil {
+			return nil, err
+		}
+		return &statefulSetHandler{statefulSet: ss}, nil
+	case "Job":
+		job := &batchv1.Job{}
+		if err := scheme.Scheme.Convert(u, job, nil); err != nil {
+			return nil, err
+		}
+		return &jobHandler{job: job}, nil
+	default:
+		return nil, nil
+	}
+}
+
 // OverridesTransform transforms deployments based on the configuration in `spec.overrides`.
 func OverridesTransform(overrides []base.WorkloadOverride, log *zap.SugaredLogger) mf.Transformer {
 	if overrides == nil {
 		return nil
 	}
 	return func(u *unstructured.Unstructured) error {
 		for _, override := range overrides {
-			var obj metav1.Object
-			var ps *corev1.PodTemplateSpec
-
-			if u.GetKind() == "Deployment" && u.GetName() == override.Name {
-				deployment := &appsv1.Deployment{}
-				if err := scheme.Scheme.Convert(u, deployment, nil); err != nil {
+			// Handle HPA separately since it doesn't follow the resource handler pattern
+			if u.GetKind() == "HorizontalPodAutoscaler" && override.Replicas != nil && u.GetName() == getHPAName(override.Name) {
+				overrideReplicas := int64(*override.Replicas)
+				if err := hpaTransform(u, overrideReplicas); err != nil {
 					return err
 				}
-				obj = deployment
-				ps = &deployment.Spec.Template
-
-				// Do not set replicas, if this resource is controlled by a HPA
-				if override.Replicas != nil && !hasHorizontalPodOrCustomAutoscaler(override.Name) {
-					deployment.Spec.Replicas = override.Replicas
-				}
+				continue
 			}
-			if u.GetKind() == "StatefulSet" && u.GetName() == override.Name {
-				ss := &appsv1.StatefulSet{}
-				if err := scheme.Scheme.Convert(u, ss, nil); err != nil {
-					return err
-				}
-				obj = ss
-				ps = &ss.Spec.Template
 
-				// Do not set replicas, if this resource is controlled by a HPA
-				if override.Replicas != nil && !hasHorizontalPodOrCustomAutoscaler(override.Name) {
-					ss.Spec.Replicas = override.Replicas
-				}
-			}
-			if u.GetKind() == "Job" && u.GetGenerateName() == override.Name {
-				job := &batchv1.Job{}
-				if err := scheme.Scheme.Convert(u, job, nil); err != nil {
-					return err
-				}
-				obj = job
-				ps = &job.Spec.Template
+			// Check if this resource matches the override
+			var matches bool
+			switch u.GetKind() {
+			case "Deployment", "StatefulSet":
+				matches = u.GetName() == override.Name
+			case "Job":
+				matches = u.GetGenerateName() == override.Name
+			default:
+				continue
 			}
 
-			if u.GetKind() == "HorizontalPodAutoscaler" && override.Replicas != nil && u.GetName() == getHPAName(override.Name) {
-				overrideReplicas := int64(*override.Replicas)
-				if err := hpaTransform(u, overrideReplicas); err != nil {
-					return err
-				}
+			if !matches {
+				continue
 			}
 
-			if obj == nil {
+			// Create the appropriate resource handler
+			handler, err := createResourceHandler(u)
+			if err != nil {
+				return err
+			}
+			if handler == nil {
 				continue
 			}
 
+			// Apply replicas if specified and not controlled by HPA
+			if override.Replicas != nil && !hasHorizontalPodOrCustomAutoscaler(override.Name) {
+				handler.SetReplicas(override.Replicas)
+			}
+
+			// Apply all other overrides
+			obj := handler.GetObject()
+			ps := handler.GetPodTemplateSpec()
+
 			replaceLabels(&override, obj, ps)
 			replaceAnnotations(&override, obj, ps)
 			replaceNodeSelector(&override, ps)
@@ -96,6 +173,7 @@ func OverridesTransform(overrides []base.WorkloadOverride, log *zap.SugaredLogge
 			replaceProbes(&override, ps)
 			replaceHostNetwork(&override, ps)
 
+			// Convert back to unstructured
 			if err := scheme.Scheme.Convert(obj, u, nil); err != nil {
 				return err
 			}
@@ -161,7 +239,7 @@ func replaceResources(override *base.WorkloadOverride, ps *corev1.PodTemplateSpe
 	if len(override.Resources) > 0 {
 		containers := ps.Spec.Containers
 		for i := range containers {
-			if override := find(override.Resources, containers[i].Name); override != nil {
+			if override := findResourceOverride(override.Resources, containers[i].Name); override != nil {
 				merge(&override.Limits, &containers[i].Resources.Limits)
 				merge(&override.Requests, &containers[i].Resources.Requests)
 			}

pkg/reconciler/knativeeventing/common/sinkbindingselectionmode.go

@@ -30,11 +30,17 @@ import (
 const SinkBindingSelectionModeEnvVarKey = "SINK_BINDING_SELECTION_MODE"
 
 // SinkBindingSelectionModeTransform sets the eventing-webhook's SINK_BINDING_SELECTION_MODE env var to the value in the spec
-func SinkBindingSelectionModeTransform(instance *eventingv1beta1.KnativeEventing, log *zap.SugaredLogger) mf.Transformer {
+func SinkBindingSelectionModeTransform(instance *eventingv1beta1.KnativeEventing, log *zap.SugaredLogger, convertFuncs ...func(in, out, context interface{}) error) mf.Transformer {
+	var convert func(in, out, context interface{}) error
+	if len(convertFuncs) > 0 && convertFuncs[0] != nil {
+		convert = convertFuncs[0]
+	} else {
+		convert = scheme.Scheme.Convert
+	}
 	return func(u *unstructured.Unstructured) error {
 		if u.GetKind() == "Deployment" && u.GetName() == "eventing-webhook" {
 			deployment := &appsv1.Deployment{}
-			err := scheme.Scheme.Convert(u, deployment, nil)
+			err := convert(u, deployment, nil)
 			if err != nil {
 				log.Error(err, "Error converting Unstructured to Deployment", "unstructured", u, "deployment", deployment)
 				return err
@@ -65,7 +71,7 @@ func SinkBindingSelectionModeTransform(instance *eventingv1beta1.KnativeEventing
 				}
 			}
 
-			err = scheme.Scheme.Convert(deployment, u, nil)
+			err = convert(deployment, u, nil)
 			if err != nil {
 				return err
 			}