From a5cf22f6a7ba0ed869fb40f0224984a0ff13dcfd Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Tue, 26 Aug 2025 15:58:42 +0200 Subject: [PATCH] fix: ignore jupyterservers if the CRD is not found --- pkg/k8s/jupyterserver.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/k8s/jupyterserver.go b/pkg/k8s/jupyterserver.go index 0e5cd68..8a37a42 100644 --- a/pkg/k8s/jupyterserver.go +++ b/pkg/k8s/jupyterserver.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" @@ -51,7 +52,10 @@ func DeleteJupyterServers(ctx context.Context, client *dynamic.DynamicClient, na propagation := metav1.DeletePropagationBackground err := client.Resource(*gvr).Namespace(namespace).DeleteCollection(ctx, metav1.DeleteOptions{PropagationPolicy: &propagation}, metav1.ListOptions{}) - if err != nil { + if err != nil && k8serrors.IsNotFound(err) { + fmt.Printf("Warning: Resource not found: %s\n", gvr.String()) + return nil + } else if err != nil { return err } return nil @@ -82,7 +86,13 @@ func ForciblyDeleteJupyterServer(ctx context.Context, client *dynamic.DynamicCli func ForciblyDeleteJupyterServers(ctx context.Context, client *dynamic.DynamicClient, namespace string, gvr *schema.GroupVersionResource) error { servers, err := ListJupyterServers(ctx, client, namespace, gvr) - if err != nil { + if err != nil && k8serrors.IsNotFound(err) { + if gvr == nil { + gvr = &jupyterServerGroupVersionResource + } + fmt.Printf("Warning: Resource not found: %s\n", gvr.String()) + return nil + } else if err != nil { return err }