Skip to content

Commit 3115cca

Browse files
authored
fix: ignore jupyterservers if the CRD is not found (#28)
1 parent bee83f0 commit 3115cca

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

pkg/k8s/jupyterserver.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66

7+
k8serrors "k8s.io/apimachinery/pkg/api/errors"
78
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
89
"k8s.io/apimachinery/pkg/runtime/schema"
910
"k8s.io/client-go/dynamic"
@@ -51,7 +52,10 @@ func DeleteJupyterServers(ctx context.Context, client *dynamic.DynamicClient, na
5152

5253
propagation := metav1.DeletePropagationBackground
5354
err := client.Resource(*gvr).Namespace(namespace).DeleteCollection(ctx, metav1.DeleteOptions{PropagationPolicy: &propagation}, metav1.ListOptions{})
54-
if err != nil {
55+
if err != nil && k8serrors.IsNotFound(err) {
56+
fmt.Printf("Warning: Resource not found: %s\n", gvr.String())
57+
return nil
58+
} else if err != nil {
5559
return err
5660
}
5761
return nil
@@ -82,7 +86,13 @@ func ForciblyDeleteJupyterServer(ctx context.Context, client *dynamic.DynamicCli
8286

8387
func ForciblyDeleteJupyterServers(ctx context.Context, client *dynamic.DynamicClient, namespace string, gvr *schema.GroupVersionResource) error {
8488
servers, err := ListJupyterServers(ctx, client, namespace, gvr)
85-
if err != nil {
89+
if err != nil && k8serrors.IsNotFound(err) {
90+
if gvr == nil {
91+
gvr = &jupyterServerGroupVersionResource
92+
}
93+
fmt.Printf("Warning: Resource not found: %s\n", gvr.String())
94+
return nil
95+
} else if err != nil {
8696
return err
8797
}
8898

0 commit comments

Comments
 (0)