Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
13 changes: 11 additions & 2 deletions go/core/internal/httpserver/handlers/substrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/kagent-dev/kagent/go/core/internal/httpserver/errors"
"github.com/kagent-dev/kagent/go/core/pkg/auth"
"github.com/kagent-dev/kagent/go/core/pkg/sandboxbackend/substrate"
"k8s.io/apimachinery/pkg/api/meta"
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"sigs.k8s.io/controller-runtime/pkg/client"
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
Expand Down Expand Up @@ -110,11 +111,19 @@ func (h *SubstrateHandler) listSubstrateCRs(ctx context.Context, namespace strin

wpList := &atev1alpha1.WorkerPoolList{}
if err := h.KubeClient.List(ctx, wpList, listOpts...); err != nil {
return nil, nil, err
if meta.IsNoMatchError(err) {
ctrllog.FromContext(ctx).Info("WorkerPool CRD not found, returning empty list", "namespace", namespace)
} else {
return nil, nil, err
}
Comment on lines +114 to +118
}
tmplList := &atev1alpha1.ActorTemplateList{}
if err := h.KubeClient.List(ctx, tmplList, listOpts...); err != nil {
return nil, nil, err
if meta.IsNoMatchError(err) {
ctrllog.FromContext(ctx).Info("ActorTemplate CRD not found, returning empty list", "namespace", namespace)
} else {
return nil, nil, err
}
Comment on lines +122 to +126
}

workerPools := make([]api.SubstrateWorkerPoolEntry, 0, len(wpList.Items))
Expand Down
23 changes: 23 additions & 0 deletions go/core/internal/httpserver/handlers/substrate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,26 @@ func TestHandleGetSubstrateStatus(t *testing.T) {
require.Equal(t, "Running", wrapped.Data.Actors[0].Status)
require.Len(t, wrapped.Data.Workers, 1)
}

func TestHandleGetSubstrateStatus_MissingCRDs(t *testing.T) {
t.Parallel()

// Use a client that returns NoKindMatchError for all List calls,
// simulating a cluster where the ate.dev CRDs are not installed.
base := &handlers.Base{KubeClient: noMatchKubeClient{}, Authorizer: &auth.NoopAuthorizer{}}
ate := &substrate.Client{ControlClient: &stubAteControl{}}
h := handlers.NewSubstrateHandler(base, ate)

req := httptest.NewRequest(http.MethodGet, "/api/substrate/status?namespace=kagent", nil)
req = setUser(req, "test-user")
rec := httptest.NewRecorder()
h.HandleGetSubstrateStatus(&testErrorResponseWriter{ResponseWriter: rec}, req)

require.Equal(t, http.StatusOK, rec.Code)

var wrapped api.StandardResponse[api.SubstrateStatusResponse]
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &wrapped))
require.True(t, wrapped.Data.Enabled)
require.Empty(t, wrapped.Data.WorkerPools)
require.Empty(t, wrapped.Data.ActorTemplates)
}
Loading