operator: set controller references correctly

Author: mangelajo

deploy/operator/internal/controller/jumpstarter/endpoints/endpoints.go

@@ -53,20 +53,14 @@ func (r *Reconciler) createOrUpdateService(ctx context.Context, service *corev1.
 	existingService.Name = service.Name
 	existingService.Namespace = service.Namespace
 
-	if err := controllerutil.SetControllerReference(owner, service, r.Scheme); err != nil {
-		return err
-	}
-
 	op, err := controllerutil.CreateOrUpdate(ctx, r.Client, existingService, func() error {
 		// Preserve immutable fields if service already exists
 		if existingService.CreationTimestamp.IsZero() {
 			// Service is being created, copy all fields from desired service
 			existingService.Spec = service.Spec
 			existingService.Labels = service.Labels
 			existingService.Annotations = service.Annotations
-			if err := controllerutil.SetControllerReference(owner, service, r.Scheme); err != nil {
-				return err
-			}
+			return controllerutil.SetControllerReference(owner, existingService, r.Scheme)
 
 		} else {
 			// Preserve existing NodePorts to prevent "port already allocated" errors
@@ -91,9 +85,8 @@ func (r *Reconciler) createOrUpdateService(ctx context.Context, service *corev1.
 			existingService.Spec.Type = service.Spec.Type
 			existingService.Labels = service.Labels
 			existingService.Annotations = service.Annotations
+			return controllerutil.SetControllerReference(owner, existingService, r.Scheme)
 		}
-
-		return nil
 	})
 
 	if err != nil {

deploy/operator/internal/controller/jumpstarter/jumpstarter_controller.go

@@ -175,8 +175,6 @@ func (r *JumpstarterReconciler) reconcileControllerDeployment(ctx context.Contex
 	log := logf.FromContext(ctx)
 	desiredDeployment := r.createControllerDeployment(jumpstarter)
 
-	controllerutil.SetControllerReference(jumpstarter, desiredDeployment, r.Scheme)
-
 	existingDeployment := &appsv1.Deployment{}
 	existingDeployment.Name = desiredDeployment.Name
 	existingDeployment.Namespace = desiredDeployment.Namespace
@@ -188,7 +186,7 @@ func (r *JumpstarterReconciler) reconcileControllerDeployment(ctx context.Contex
 			existingDeployment.Labels = desiredDeployment.Labels
 			existingDeployment.Annotations = desiredDeployment.Annotations
 			existingDeployment.Spec = desiredDeployment.Spec
-			return nil
+			return controllerutil.SetControllerReference(jumpstarter, existingDeployment, r.Scheme)
 		}
 
 		desiredDeployment.Spec.Template.Spec.DeprecatedServiceAccount = existingDeployment.Spec.Template.Spec.DeprecatedServiceAccount
@@ -246,8 +244,6 @@ func (r *JumpstarterReconciler) reconcileRouterDeployment(ctx context.Context, j
 	for i := int32(0); i < jumpstarter.Spec.Routers.Replicas; i++ {
 		desiredDeployment := r.createRouterDeployment(jumpstarter, i)
 
-		controllerutil.SetControllerReference(jumpstarter, desiredDeployment, r.Scheme)
-
 		existingDeployment := &appsv1.Deployment{}
 		existingDeployment.Name = desiredDeployment.Name
 		existingDeployment.Namespace = desiredDeployment.Namespace
@@ -259,7 +255,7 @@ func (r *JumpstarterReconciler) reconcileRouterDeployment(ctx context.Context, j
 				existingDeployment.Labels = desiredDeployment.Labels
 				existingDeployment.Annotations = desiredDeployment.Annotations
 				existingDeployment.Spec = desiredDeployment.Spec
-				return nil
+				return controllerutil.SetControllerReference(jumpstarter, existingDeployment, r.Scheme)
 			}
 			desiredDeployment.Spec.Template.Spec.SchedulerName = existingDeployment.Spec.Template.Spec.SchedulerName
 			desiredDeployment.Spec.Template.Spec.DeprecatedServiceAccount = existingDeployment.Spec.Template.Spec.DeprecatedServiceAccount

deploy/operator/internal/controller/jumpstarter/rbac.go

@@ -63,7 +63,6 @@ func (r *JumpstarterReconciler) reconcileRBAC(ctx context.Context, jumpstarter *
 
 	// Role
 	desiredRole := r.createRole(jumpstarter)
-	controllerutil.SetControllerReference(jumpstarter, desiredRole, r.Scheme)
 
 	existingRole := &rbacv1.Role{}
 	existingRole.Name = desiredRole.Name
@@ -76,7 +75,7 @@ func (r *JumpstarterReconciler) reconcileRBAC(ctx context.Context, jumpstarter *
 			existingRole.Labels = desiredRole.Labels
 			existingRole.Annotations = desiredRole.Annotations
 			existingRole.Rules = desiredRole.Rules
-			return nil
+			return controllerutil.SetControllerReference(jumpstarter, existingRole, r.Scheme)
 		}
 
 		// Role exists, check if update is needed
@@ -108,7 +107,6 @@ func (r *JumpstarterReconciler) reconcileRBAC(ctx context.Context, jumpstarter *
 
 	// RoleBinding
 	desiredRoleBinding := r.createRoleBinding(jumpstarter)
-	controllerutil.SetControllerReference(jumpstarter, desiredRoleBinding, r.Scheme)
 
 	existingRoleBinding := &rbacv1.RoleBinding{}
 	existingRoleBinding.Name = desiredRoleBinding.Name
@@ -122,7 +120,7 @@ func (r *JumpstarterReconciler) reconcileRBAC(ctx context.Context, jumpstarter *
 			existingRoleBinding.Annotations = desiredRoleBinding.Annotations
 			existingRoleBinding.Subjects = desiredRoleBinding.Subjects
 			existingRoleBinding.RoleRef = desiredRoleBinding.RoleRef
-			return nil
+			return controllerutil.SetControllerReference(jumpstarter, existingRoleBinding, r.Scheme)
 		}
 
 		// RoleBinding exists, check if update is needed