Skip to content

fix: tolerate missing ResourceClaim API during PCLQ reconcile and delete #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SAY-5 wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −1
Open

fix: tolerate missing ResourceClaim API during PCLQ reconcile and delete #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion operator/internal/controller/podclique/components/resourceclaim/resourceclaim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

"github.com/go-logr/logr"
resourcev1 "k8s.io/api/resource/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -64,6 +65,9 @@ func (r _resource) GetExistingResourceNames(ctx context.Context, _ logr.Logger,
client.InNamespace(pclqObjMeta.Namespace),
client.MatchingLabels(pclqResourceClaimLabels(pclqObjMeta)),
); err != nil {
if meta.IsNoMatchError(err) {
return nil, nil
}
return nil, groveerr.WrapError(err,
errSyncPCLQLevelRC,
component.OperationGetExistingResourceNames,
Expand Down Expand Up @@ -188,12 +192,16 @@ func pclqResourceClaimLabels(pclqObjMeta metav1.ObjectMeta) map[string]string {
// This is required because the PCLQ finalizer's verifyNoResourcesAwaitsCleanup
// blocks finalizer removal until all owned resources are gone; relying solely on
// GC would create a deadlock since GC only fires after the PCLQ is fully deleted.
func (r _resource) Delete(ctx context.Context, _ logr.Logger, pclqObjMeta metav1.ObjectMeta) error {
func (r _resource) Delete(ctx context.Context, logger logr.Logger, pclqObjMeta metav1.ObjectMeta) error {
labels := pclqResourceClaimLabels(pclqObjMeta)
if err := r.client.DeleteAllOf(ctx, &resourcev1.ResourceClaim{},
client.InNamespace(pclqObjMeta.Namespace),
client.MatchingLabels(labels),
); err != nil {
if meta.IsNoMatchError(err) {
logger.V(1).Info("ResourceClaim API not served by cluster, skipping delete", "namespace", pclqObjMeta.Namespace, "podClique", pclqObjMeta.Name, "err", err.Error())
return nil
Copy link
Copy Markdown

@estroz estroz May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be useful to debug log the error in case of misconfiguration

}
return groveerr.WrapError(err,
errDeletePCLQLevelRC,
component.OperationDelete,
Expand Down
37 changes: 37 additions & 0 deletions operator/internal/controller/podclique/components/resourceclaim/resourceclaim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,27 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
resourcev1 "k8s.io/api/resource/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
)

// noResourceClaimAPIInterceptor simulates a cluster whose apiserver does not
// serve resource.k8s.io ResourceClaim by returning a NoKindMatchError.
var noResourceClaimAPIInterceptor = interceptor.Funcs{
List: func(_ context.Context, _ client.WithWatch, _ client.ObjectList, _ ...client.ListOption) error {
return &meta.NoKindMatchError{GroupKind: schema.GroupKind{Group: resourcev1.GroupName, Kind: "ResourceClaim"}}
},
DeleteAllOf: func(_ context.Context, _ client.WithWatch, _ client.Object, _ ...client.DeleteAllOfOption) error {
return &meta.NoKindMatchError{GroupKind: schema.GroupKind{Group: resourcev1.GroupName, Kind: "ResourceClaim"}}
},
}

func newTestScheme() *runtime.Scheme {
scheme := runtime.NewScheme()
_ = grovecorev1alpha1.AddToScheme(scheme)
Expand Down Expand Up @@ -191,6 +206,15 @@ func TestGetExistingResourceNames(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, []string{pclqName + "-all-gpu-mps"}, names)
})

t.Run("returns empty when ResourceClaim API is not served", func(t *testing.T) {
cl := fake.NewClientBuilder().WithScheme(scheme).WithInterceptorFuncs(noResourceClaimAPIInterceptor).Build()
r := _resource{client: cl, scheme: scheme}

names, err := r.GetExistingResourceNames(context.Background(), logr.Discard(), pclqMeta)
require.NoError(t, err)
assert.Empty(t, names)
})
}

// --- Sync ---
Expand Down Expand Up @@ -387,4 +411,17 @@ func TestDelete(t *testing.T) {
err := r.Delete(context.Background(), logr.Discard(), pclqMeta)
require.NoError(t, err)
})

t.Run("no-op when ResourceClaim API is not served", func(t *testing.T) {
pclqMeta := metav1.ObjectMeta{
Name: pclqName,
Namespace: namespace,
Labels: map[string]string{apicommon.LabelPartOfKey: pcsName},
}
cl := fake.NewClientBuilder().WithScheme(scheme).WithInterceptorFuncs(noResourceClaimAPIInterceptor).Build()
r := _resource{client: cl, scheme: scheme}

err := r.Delete(context.Background(), logr.Discard(), pclqMeta)
require.NoError(t, err)
})
}
Loading