From 342ef6234d4c7acf3ffca0f01831de316fb7ac11 Mon Sep 17 00:00:00 2001 From: erwinvaneyk Date: Wed, 17 Nov 2021 12:24:49 +0100 Subject: [PATCH] Improve the error message when trying to proxy unsupported service type --- staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go index f7dd703a674..f0a4901b370 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go +++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go @@ -45,11 +45,6 @@ func ResolveEndpoint(services listersv1.ServiceLister, endpoints listersv1.Endpo return nil, err } - svcPort, err := findServicePort(svc, port) - if err != nil { - return nil, err - } - switch { case svc.Spec.Type == v1.ServiceTypeClusterIP, svc.Spec.Type == v1.ServiceTypeLoadBalancer, svc.Spec.Type == v1.ServiceTypeNodePort: // these are fine @@ -57,6 +52,11 @@ func ResolveEndpoint(services listersv1.ServiceLister, endpoints listersv1.Endpo return nil, fmt.Errorf("unsupported service type %q", svc.Spec.Type) } + svcPort, err := findServicePort(svc, port) + if err != nil { + return nil, err + } + eps, err := endpoints.Endpoints(namespace).Get(svc.Name) if err != nil { return nil, err