WIP: Implement multi-port Services

This commit is contained in:
Tim Hockin
2015-03-13 08:16:41 -07:00
parent 9ed87612d0
commit 186818d787
70 changed files with 2118 additions and 815 deletions

View File

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

View File

@@ -307,8 +307,10 @@ var _ = Describe("Pods", func() {
},
},
Spec: api.ServiceSpec{
Port: 8765,
TargetPort: util.NewIntOrStringFromInt(8080),
Ports: []api.ServicePort{{
Port: 8765,
TargetPort: util.NewIntOrStringFromInt(8080),
}},
Selector: map[string]string{
"name": serverName,
},

View File

@@ -204,9 +204,11 @@ var _ = Describe("Services", func() {
Name: serviceName,
},
Spec: api.ServiceSpec{
Port: 80,
Selector: labels,
TargetPort: util.NewIntOrStringFromInt(80),
Selector: labels,
Ports: []api.ServicePort{{
Port: 80,
TargetPort: util.NewIntOrStringFromInt(80),
}},
},
}
_, err := c.Services(ns).Create(service)
@@ -264,9 +266,11 @@ var _ = Describe("Services", func() {
Name: serviceName,
},
Spec: api.ServiceSpec{
Port: 80,
Selector: labels,
TargetPort: util.NewIntOrStringFromInt(80),
Selector: labels,
Ports: []api.ServicePort{{
Port: 80,
TargetPort: util.NewIntOrStringFromInt(80),
}},
CreateExternalLoadBalancer: true,
},
}
@@ -287,7 +291,7 @@ var _ = Describe("Services", func() {
Failf("got unexpected number (%d) of public IPs for externally load balanced service: %v", result.Spec.PublicIPs, result)
}
ip := result.Spec.PublicIPs[0]
port := result.Spec.Port
port := result.Spec.Ports[0].Port
pod := &api.Pod{
TypeMeta: api.TypeMeta{
@@ -351,9 +355,11 @@ var _ = Describe("Services", func() {
service := &api.Service{
ObjectMeta: api.ObjectMeta{},
Spec: api.ServiceSpec{
Port: 80,
Selector: labels,
TargetPort: util.NewIntOrStringFromInt(80),
Selector: labels,
Ports: []api.ServicePort{{
Port: 80,
TargetPort: util.NewIntOrStringFromInt(80),
}},
CreateExternalLoadBalancer: true,
},
}