kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106488 from erwinvaneyk/improve-error-msg-externalname-service 

Improve the error message when trying to proxy an unsupported service type

Kubernetes-commit: 0aaeff56871a97ea150817b2979e319c8e5c424e
This commit is contained in:
Kubernetes Publisher 2022-01-06 11:47:03 -08:00
parent 75ed1d2775 23f238960a
commit ab3c7c45d0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -44,7 +44,7 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20220104023900-7289fed567b9 k8s.io/api v0.0.0-20220104023900-7289fed567b9
k8s.io/apimachinery v0.0.0-20220106171618-16466225c572 k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7
k8s.io/client-go v0.0.0-20220105172055-255c79651356 k8s.io/client-go v0.0.0-20220105172055-255c79651356
k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100 k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100
k8s.io/klog/v2 v2.40.1 k8s.io/klog/v2 v2.40.1
@ -58,7 +58,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220104023900-7289fed567b9 k8s.io/api => k8s.io/api v0.0.0-20220104023900-7289fed567b9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220106171618-16466225c572 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7
k8s.io/client-go => k8s.io/client-go v0.0.0-20220105172055-255c79651356 k8s.io/client-go => k8s.io/client-go v0.0.0-20220105172055-255c79651356
k8s.io/component-base => k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100 k8s.io/component-base => k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100
) )

4
go.sum
View File

@ -953,8 +953,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220104023900-7289fed567b9 h1:HghyPmUKTDSohvaoMdU8NmSTLV3GMrwWfUjJX33U7aE= k8s.io/api v0.0.0-20220104023900-7289fed567b9 h1:HghyPmUKTDSohvaoMdU8NmSTLV3GMrwWfUjJX33U7aE=
k8s.io/api v0.0.0-20220104023900-7289fed567b9/go.mod h1:nKerto6bPj5aBqqPdGEHYEtwdsvWd6LAIUE0QPgQzoE= k8s.io/api v0.0.0-20220104023900-7289fed567b9/go.mod h1:nKerto6bPj5aBqqPdGEHYEtwdsvWd6LAIUE0QPgQzoE=
k8s.io/apimachinery v0.0.0-20220106171618-16466225c572 h1:GOr2jR2rUZmkAF58Zf3QKp5PcUvYJXeSSg4XfbQe4jI= k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7 h1:IHAn08cVL/qPDtyS6VLVORr8iKiJl9UJgTFpPxM+gNs=
k8s.io/apimachinery v0.0.0-20220106171618-16466225c572/go.mod h1:vcZg0n5bcYADuuKUza0y2en2OCM/UIxFaAI7N0cN6Ik= k8s.io/apimachinery v0.0.0-20220106211624-e9b426bb59b7/go.mod h1:vcZg0n5bcYADuuKUza0y2en2OCM/UIxFaAI7N0cN6Ik=
k8s.io/client-go v0.0.0-20220105172055-255c79651356 h1:uNiuxb+Z7sPRSIWJiR20WrwpvSmMT5RMkBaxCdaLS2k= k8s.io/client-go v0.0.0-20220105172055-255c79651356 h1:uNiuxb+Z7sPRSIWJiR20WrwpvSmMT5RMkBaxCdaLS2k=
k8s.io/client-go v0.0.0-20220105172055-255c79651356/go.mod h1:8wJ34MBqSNCHmQ1mGLLHqI68ERylfM0lr3UK2WQOShk= k8s.io/client-go v0.0.0-20220105172055-255c79651356/go.mod h1:8wJ34MBqSNCHmQ1mGLLHqI68ERylfM0lr3UK2WQOShk=
k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100 h1:MtcO/Ysm2eaDif2wEngbGDI72FIHId/80y+x0koGLrg= k8s.io/component-base v0.0.0-20220104212607-e7b8df8cf100 h1:MtcO/Ysm2eaDif2wEngbGDI72FIHId/80y+x0koGLrg=

10
pkg/util/proxy/proxy.go
View File

@ -45,11 +45,6 @@ func ResolveEndpoint(services listersv1.ServiceLister, endpoints listersv1.Endpo
return nil, err return nil, err
} }
svcPort, err := findServicePort(svc, port)
if err != nil {
return nil, err
}
switch { switch {
case svc.Spec.Type == v1.ServiceTypeClusterIP, svc.Spec.Type == v1.ServiceTypeLoadBalancer, svc.Spec.Type == v1.ServiceTypeNodePort: case svc.Spec.Type == v1.ServiceTypeClusterIP, svc.Spec.Type == v1.ServiceTypeLoadBalancer, svc.Spec.Type == v1.ServiceTypeNodePort:
// these are fine // 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) 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) eps, err := endpoints.Endpoints(namespace).Get(svc.Name)
if err != nil { if err != nil {
return nil, err return nil, err