From 1fa995224aa4d5d3707ac142ff5e9304d6839f7c Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Fri, 24 Jan 2025 19:45:36 +0100 Subject: [PATCH] Update scale sub-resource to return the same error everywhere Signed-off-by: Maciej Szulik --- pkg/registry/apps/deployment/storage/storage.go | 2 +- pkg/registry/apps/replicaset/storage/storage.go | 2 +- pkg/registry/core/replicationcontroller/storage/storage.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/registry/apps/deployment/storage/storage.go b/pkg/registry/apps/deployment/storage/storage.go index 2a08ddc4bc1..f023d76bf69 100644 --- a/pkg/registry/apps/deployment/storage/storage.go +++ b/pkg/registry/apps/deployment/storage/storage.go @@ -306,7 +306,7 @@ func (r *ScaleREST) Destroy() { func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { obj, err := r.store.Get(ctx, name, options) if err != nil { - return nil, errors.NewNotFound(apps.Resource("deployments/scale"), name) + return nil, err } deployment := obj.(*apps.Deployment) scale, err := scaleFromDeployment(deployment) diff --git a/pkg/registry/apps/replicaset/storage/storage.go b/pkg/registry/apps/replicaset/storage/storage.go index 1fa6c8759d1..ee92eb2ff4f 100644 --- a/pkg/registry/apps/replicaset/storage/storage.go +++ b/pkg/registry/apps/replicaset/storage/storage.go @@ -202,7 +202,7 @@ func (r *ScaleREST) Destroy() { func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { obj, err := r.store.Get(ctx, name, options) if err != nil { - return nil, errors.NewNotFound(apps.Resource("replicasets/scale"), name) + return nil, err } rs := obj.(*apps.ReplicaSet) scale, err := scaleFromReplicaSet(rs) diff --git a/pkg/registry/core/replicationcontroller/storage/storage.go b/pkg/registry/core/replicationcontroller/storage/storage.go index c1f69e8cba0..b2e34c9560d 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage.go +++ b/pkg/registry/core/replicationcontroller/storage/storage.go @@ -190,7 +190,7 @@ func (r *ScaleREST) Destroy() { func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { obj, err := r.store.Get(ctx, name, options) if err != nil { - return nil, errors.NewNotFound(autoscaling.Resource("replicationcontrollers/scale"), name) + return nil, err } rc := obj.(*api.ReplicationController) return scaleFromRC(rc), nil