Merge pull request #5729 from thockin/plural_endpoints_30_restart

Rename Service.ContainerPort to TargetPort in v1b3

test/e2e/networking.go

@@ -77,8 +77,8 @@ var _ = Describe("Networking", func() {
 				},
 			},
 			Spec: api.ServiceSpec{
-				Port:          8080,
-				ContainerPort: util.NewIntOrStringFromInt(8080),
+				Port:       8080,
+				TargetPort: util.NewIntOrStringFromInt(8080),
 				Selector: map[string]string{
 					"name": name,
 				},