Fix linter issues and code review suggestions

Author: daniellutz

components/odh-notebook-controller/controllers/notebook_controller_test.go

@@ -1061,7 +1061,10 @@ var _ = Describe("The Openshift Notebook controller", func() {
 			By("Ensuring finalizer exists first")
 			Eventually(func() []string {
 				var updated nbv1.Notebook
-				cli.Get(ctx, notebookKey, &updated)
+				err := cli.Get(ctx, notebookKey, &updated)
+				if err != nil {
+					return nil
+				}
 				return updated.Finalizers
 			}, duration, interval).Should(ContainElement(Finalizer))
 
@@ -1083,7 +1086,10 @@ var _ = Describe("The Openshift Notebook controller", func() {
 			By("Ensuring prerequisite resources exist")
 			Eventually(func() []string {
 				var updated nbv1.Notebook
-				cli.Get(ctx, notebookKey, &updated)
+				err := cli.Get(ctx, notebookKey, &updated)
+				if err != nil {
+					return nil
+				}
 				return updated.Finalizers
 			}, duration, interval).Should(ContainElement(Finalizer))
 
@@ -1100,8 +1106,10 @@ var _ = Describe("The Openshift Notebook controller", func() {
 			By("Verifying notebook is marked for deletion but persists due to finalizer")
 			Eventually(func() bool {
 				var updated nbv1.Notebook
-				err := cli.Get(ctx, notebookKey, &updated)
-				return err == nil && updated.DeletionTimestamp != nil
+				if err := cli.Get(ctx, notebookKey, &updated); err != nil {
+					return false
+				}
+				return updated.DeletionTimestamp != nil
 			}, duration, interval).Should(BeTrue(),
 				"Notebook should be marked for deletion but persist due to finalizer")
 
@@ -1120,7 +1128,7 @@ var _ = Describe("The Openshift Notebook controller", func() {
 			Eventually(func() error {
 				var oauth oauthv1.OAuthClient
 				return cli.Get(ctx, oauthClientKey, &oauth)
-			}, time.Second*30).Should(MatchError(ContainSubstring("not found")))
+			}, duration, interval).Should(MatchError(ContainSubstring("not found")))
 
 			By("Verifying finalizer is removed and notebook is deleted")
 			Eventually(func() error {

components/odh-notebook-controller/controllers/notebook_oauth.go

@@ -327,10 +327,13 @@ func (r *OpenshiftNotebookReconciler) ReconcileOAuthClient(notebook *nbv1.Notebo
 
 func (r *OpenshiftNotebookReconciler) HandleOAuthClientFinalizer(notebook *nbv1.Notebook, ctx context.Context) (bool, error) {
 	finalizerName := "notebooks.kubeflow.org/oauthclient"
+	log := logf.FromContext(ctx)
 
 	// Check if object is being deleted
 	if notebook.GetDeletionTimestamp() != nil {
 		if controllerutil.ContainsFinalizer(notebook, finalizerName) {
+			log.Info("Notebook deletion detected, cleaning up OAuthClient", "notebook", notebook.Name)
+
 			if err := r.cleanupOAuthClient(notebook, ctx); err != nil {
 				return true, err
 			}
@@ -339,13 +342,17 @@ func (r *OpenshiftNotebookReconciler) HandleOAuthClientFinalizer(notebook *nbv1.
 			if err := r.Update(ctx, notebook); err != nil {
 				return true, err
 			}
+
+			log.Info("OAuthClient cleanup completed", "notebook", notebook.Name)
 		}
 		// Return true to indicate finalization is in progress
 		return true, nil
 	}
 
 	// Add finalizer if it doesn't exist yet
 	if !controllerutil.ContainsFinalizer(notebook, finalizerName) {
+		log.Info("Adding finalizer to notebook", "notebook", notebook.Name)
+
 		controllerutil.AddFinalizer(notebook, finalizerName)
 		if err := r.Update(ctx, notebook); err != nil {
 			return true, err