From 915850cfc08ed77e24c53a02da79005201ff2ad1 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 26 May 2022 19:08:55 -0700 Subject: [PATCH] Switch image details to get --- pkg/client/image.go | 4 ++-- pkg/server/registry/images/detail.go | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/client/image.go b/pkg/client/image.go index 2a3a9104d..823cc31d3 100644 --- a/pkg/client/image.go +++ b/pkg/client/image.go @@ -33,12 +33,12 @@ func (c *client) ImageDetails(ctx context.Context, imageName string, opts *Image imageName = strings.ReplaceAll(imageName, "/", "+") detailsResult := &apiv1.ImageDetails{} - err := c.RESTClient.Post(). + err := c.RESTClient.Get(). Namespace(c.Namespace). Resource("images"). Name(imageName). SubResource("details"). - Body(&apiv1.ImageDetails{}).Do(ctx).Into(detailsResult) + Do(ctx).Into(detailsResult) if err != nil { return nil, err } diff --git a/pkg/server/registry/images/detail.go b/pkg/server/registry/images/detail.go index 3bc195dff..801c6b86e 100644 --- a/pkg/server/registry/images/detail.go +++ b/pkg/server/registry/images/detail.go @@ -10,7 +10,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/apiserver/pkg/registry/rest" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -34,15 +33,9 @@ func (s *ImageDetails) New() runtime.Object { return &apiv1.ImageDetails{} } -func (s *ImageDetails) Create(ctx context.Context, name string, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) { +func (s *ImageDetails) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { name = strings.ReplaceAll(name, "+", "/") - if createValidation != nil { - if err := createValidation(ctx, obj); err != nil { - return nil, err - } - } - ns, _ := request.NamespaceFrom(ctx) imageName := name