github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5729 from thockin/plural_endpoints_30_restart

Browse Source 
Rename Service.ContainerPort to TargetPort in v1b3
This commit is contained in:
Dawn Chen
2015-03-20 14:37:46 -07:00
parent 0206115703 4375376e9c
commit 7a6490f572
28 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1156,16 +1156,16 @@ func TestValidateService(t *testing.T) {
numErrs: 1,
},
{
name: "missing destinationPort string",
name: "missing targetPort string",
makeSvc: func(s *api.Service) {
s.Spec.ContainerPort = util.NewIntOrStringFromString("")
s.Spec.TargetPort = util.NewIntOrStringFromString("")
},
numErrs: 1,
},
{
name: "invalid destinationPort int",
name: "invalid targetPort int",
makeSvc: func(s *api.Service) {
s.Spec.ContainerPort = util.NewIntOrStringFromInt(65536)
s.Spec.TargetPort = util.NewIntOrStringFromInt(65536)
},
numErrs: 1,
},
@@ -1187,14 +1187,14 @@ func TestValidateService(t *testing.T) {
name: "valid 2",
makeSvc: func(s *api.Service) {
s.Spec.Protocol = "UDP"
s.Spec.ContainerPort = util.NewIntOrStringFromInt(12345)
s.Spec.TargetPort = util.NewIntOrStringFromInt(12345)
},
numErrs: 0,
},
{
name: "valid 3",
makeSvc: func(s *api.Service) {
s.Spec.ContainerPort = util.NewIntOrStringFromString("http")
s.Spec.TargetPort = util.NewIntOrStringFromString("http")
},
numErrs: 0,
},