scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure headless service port equal to targetPort

Browse Source
This commit is contained in:
feihujiang
2015-11-27 16:09:13 +08:00
parent 70d2a02959
commit 81b095ee52
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/validation/validation.go
View File

@@ -1239,9 +1239,11 @@ func ValidateService(service *api.Service) validation.ErrorList {
} }
} }
} }
isHeadlessService := service.Spec.ClusterIP == api.ClusterIPNone
allPortNames := sets.String{} allPortNames := sets.String{}
for i := range service.Spec.Ports { for i := range service.Spec.Ports {
allErrs = append(allErrs, validateServicePort(&service.Spec.Ports[i], len(service.Spec.Ports) > 1, &allPortNames).PrefixIndex(i).Prefix("spec.ports")...) allErrs = append(allErrs, validateServicePort(&service.Spec.Ports[i], len(service.Spec.Ports) > 1, isHeadlessService, &allPortNames).PrefixIndex(i).Prefix("spec.ports")...)
} }
if service.Spec.Selector != nil { if service.Spec.Selector != nil {
@@ -1309,7 +1311,7 @@ func ValidateService(service *api.Service) validation.ErrorList {
return allErrs return allErrs
} }
func validateServicePort(sp *api.ServicePort, requireName bool, allNames *sets.String) validation.ErrorList { func validateServicePort(sp *api.ServicePort, requireName, isHeadlessService bool, allNames *sets.String) validation.ErrorList {
allErrs := validation.ErrorList{} allErrs := validation.ErrorList{}
if requireName && sp.Name == "" { if requireName && sp.Name == "" {
@@ -1341,6 +1343,12 @@ func validateServicePort(sp *api.ServicePort, requireName bool, allNames *sets.S
allErrs = append(allErrs, validation.NewInvalidError("targetPort", sp.TargetPort, PortNameErrorMsg)) allErrs = append(allErrs, validation.NewInvalidError("targetPort", sp.TargetPort, PortNameErrorMsg))
} }
if isHeadlessService {
if sp.TargetPort.Type == intstr.String || (sp.TargetPort.Type == intstr.Int && sp.Port != sp.TargetPort.IntValue()) {
allErrs = append(allErrs, validation.NewInvalidError("port", sp.Port, "must be equal to targetPort when clusterIP = None"))
}
}
return allErrs return allErrs
} }

27
pkg/api/validation/validation_test.go
View File

@@ -1874,6 +1874,33 @@ func TestValidateService(t *testing.T) {
}, },
numErrs: 1, numErrs: 1,
}, },
{
name: "valid port headless",
tweakSvc: func(s *api.Service) {
s.Spec.Ports[0].Port = 11722
s.Spec.Ports[0].TargetPort = intstr.FromInt(11722)
s.Spec.ClusterIP = api.ClusterIPNone
},
numErrs: 0,
},
{
name: "invalid port headless",
tweakSvc: func(s *api.Service) {
s.Spec.Ports[0].Port = 11722
s.Spec.Ports[0].TargetPort = intstr.FromInt(11721)
s.Spec.ClusterIP = api.ClusterIPNone
},
numErrs: 1,
},
{
name: "invalid port headless",
tweakSvc: func(s *api.Service) {
s.Spec.Ports[0].Port = 11722
s.Spec.Ports[0].TargetPort = intstr.FromString("target")
s.Spec.ClusterIP = api.ClusterIPNone
},
numErrs: 1,
},
{ {
name: "invalid publicIPs localhost", name: "invalid publicIPs localhost",
tweakSvc: func(s *api.Service) { tweakSvc: func(s *api.Service) {