DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4671 from jacksontj/issue_4670

Browse source 
Discontinue use of a single DNS query to validate an endpoint name
This commit is contained in:
Kubernetes Prow Robot 2019-10-13 13:56:36 -07:00 committed by GitHub
commit decc1346dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ingress/controller/endpoints.go
View file

@ -22,6 +22,7 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/klog" "k8s.io/klog"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
@ -58,9 +59,8 @@ func getEndpoints(s *corev1.Service, port *corev1.ServicePort, proto corev1.Prot
// if the externalName is not an IP address we need to validate is a valid FQDN // if the externalName is not an IP address we need to validate is a valid FQDN
if net.ParseIP(s.Spec.ExternalName) == nil { if net.ParseIP(s.Spec.ExternalName) == nil {
_, err := net.LookupHost(s.Spec.ExternalName) if errs := validation.IsDNS1123Subdomain(s.Spec.ExternalName); len(errs) > 0 {
if err != nil { klog.Errorf("Invalid DNS name %s: %v", s.Spec.ExternalName, errs)
klog.Errorf("Error resolving host %q: %v", s.Spec.ExternalName, err)
return upsServers return upsServers
} }
} }

2
internal/ingress/controller/endpoints_test.go
View file

@ -112,7 +112,7 @@ func TestGetEndpoints(t *testing.T) {
&corev1.Service{ &corev1.Service{
Spec: corev1.ServiceSpec{ Spec: corev1.ServiceSpec{
Type: corev1.ServiceTypeExternalName, Type: corev1.ServiceTypeExternalName,
ExternalName: "foo.bar", ExternalName: "1#invalid.hostname",
Ports: []corev1.ServicePort{ Ports: []corev1.ServicePort{
{ {
Name: "default", Name: "default",

4
test/e2e/servicebackend/service_externalname.go
View file

@ -146,7 +146,7 @@ var _ = framework.IngressNginxDescribe("Service Type ExternalName", func() {
Expect(resp.StatusCode).Should(Equal(200)) Expect(resp.StatusCode).Should(Equal(200))
}) })
It("should return status 503 for service type=ExternalName with an invalid host", func() { It("should return status 502 for service type=ExternalName with an invalid host", func() {
host := "echo" host := "echo"
svc := &core.Service{ svc := &core.Service{
@ -175,7 +175,7 @@ var _ = framework.IngressNginxDescribe("Service Type ExternalName", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(errs).Should(BeEmpty()) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(503)) Expect(resp.StatusCode).Should(Equal(502))
}) })
It("should return 200 for service type=ExternalName using a port name", func() { It("should return 200 for service type=ExternalName using a port name", func() {