From 4d7146abb3368c526e7fec363dbd1effb426b198 Mon Sep 17 00:00:00 2001 From: atheo89 Date: Thu, 7 Nov 2024 09:24:17 +0100 Subject: [PATCH] Set proper the ownerReferences when we create a rolebinding --- .../controllers/notebook_rbac.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/odh-notebook-controller/controllers/notebook_rbac.go b/components/odh-notebook-controller/controllers/notebook_rbac.go index 6f7ede54ac0..e84ff7d144b 100644 --- a/components/odh-notebook-controller/controllers/notebook_rbac.go +++ b/components/odh-notebook-controller/controllers/notebook_rbac.go @@ -24,6 +24,7 @@ import ( apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + ctrl "sigs.k8s.io/controller-runtime" ) // NewRoleBinding defines the desired RoleBinding or ClusterRoleBinding object. @@ -123,6 +124,13 @@ func (r *OpenshiftNotebookReconciler) reconcileRoleBinding( err = r.Get(ctx, types.NamespacedName{Name: rolebindingName, Namespace: notebook.Namespace}, found) if err != nil && apierrs.IsNotFound(err) { log.Info("Creating RoleBinding", "RoleBinding.Namespace", roleBinding.Namespace, "RoleBinding.Name", roleBinding.Name) + + // Add .metatada.ownerReferences to the Rolebinding to be deleted by + // the Kubernetes garbage collector if the notebook is deleted + if err := ctrl.SetControllerReference(notebook, roleBinding, r.Scheme); err != nil { + log.Error(err, "Failed to set controller reference for RoleBinding") + return err + } err = r.Create(ctx, roleBinding) if err != nil { log.Error(err, "Failed to create RoleBinding", "RoleBinding.Namespace", roleBinding.Namespace, "RoleBinding.Name", roleBinding.Name) @@ -152,11 +160,6 @@ func (r *OpenshiftNotebookReconciler) ReconcileRoleBindings( notebook *nbv1.Notebook, ctx context.Context) error { roleBindingName := "elyra-pipelines-" + notebook.Name - // If the notebook is marked for deletion, remove the associated RoleBinding - if !notebook.ObjectMeta.DeletionTimestamp.IsZero() { - return r.deleteRoleBinding(ctx, roleBindingName, notebook.Namespace) - } - // Reconcile a RoleBinding for pipelines for the notebook service account if err := r.reconcileRoleBinding(notebook, ctx, roleBindingName, "Role", "ds-pipeline-user-access-dspa"); err != nil { return err