From 72a4cac5bb55ae94acf03b7133769f858a205eea Mon Sep 17 00:00:00 2001 From: Peter Jiang Date: Fri, 24 Oct 2025 12:46:29 -0700 Subject: [PATCH 1/3] fix: return empty instead of error if cache unavailable Signed-off-by: Peter Jiang --- server/application/application.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/application/application.go b/server/application/application.go index 3b665cfda8d14..e2de90f037125 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -1771,7 +1771,8 @@ func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQ return s.cache.GetAppManagedResources(a.InstanceName(s.ns), &items) }) if err != nil { - return nil, fmt.Errorf("error getting cached app managed resources: %w", err) + log.Warnf("Cache unavailable for %s/%s: %v. Returning empty managed resources.", a.Namespace, a.Name, err) + return &application.ManagedResourcesResponse{Items: []*v1alpha1.ResourceDiff{}}, nil } res := &application.ManagedResourcesResponse{} for i := range items { From 7598bda7598176d3d724816d969272b6695c62cd Mon Sep 17 00:00:00 2001 From: Peter Jiang Date: Mon, 27 Oct 2025 09:48:02 -0700 Subject: [PATCH 2/3] update error message Signed-off-by: Peter Jiang --- server/application/application.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/application/application.go b/server/application/application.go index e2de90f037125..d9724879522b0 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -1771,7 +1771,7 @@ func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQ return s.cache.GetAppManagedResources(a.InstanceName(s.ns), &items) }) if err != nil { - log.Warnf("Cache unavailable for %s/%s: %v. Returning empty managed resources.", a.Namespace, a.Name, err) + log.Warnf("error getting cached app managed resources, Cache unavailable for %s/%s: %v. Returning empty managed resources.", a.Namespace, a.Name, err) return &application.ManagedResourcesResponse{Items: []*v1alpha1.ResourceDiff{}}, nil } res := &application.ManagedResourcesResponse{} From 244ead6be4dd60e79d951d89290b068e40f3d64d Mon Sep 17 00:00:00 2001 From: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com> Date: Fri, 31 Oct 2025 10:41:06 -0700 Subject: [PATCH 3/3] Update server/application/application.go Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Signed-off-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com> --- server/application/application.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/application/application.go b/server/application/application.go index d9724879522b0..dd4dedccda990 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -1771,7 +1771,7 @@ func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQ return s.cache.GetAppManagedResources(a.InstanceName(s.ns), &items) }) if err != nil { - log.Warnf("error getting cached app managed resources, Cache unavailable for %s/%s: %v. Returning empty managed resources.", a.Namespace, a.Name, err) + log.Warnf("error getting cached app managed resources for %s/%s, cache unavailable, returning empty managed resources: %v", a.Namespace, a.Name, err) return &application.ManagedResourcesResponse{Items: []*v1alpha1.ResourceDiff{}}, nil } res := &application.ManagedResourcesResponse{}