Merge pull request #3331 from pmorie/services

Service visibility w/in namespaces, master services, set env vars in kubelet
This commit is contained in:
Eric Tune
2015-01-14 15:01:05 -08:00
14 changed files with 790 additions and 140 deletions

View File

@@ -878,7 +878,10 @@ func TestValidateService(t *testing.T) {
},
existing: api.ServiceList{
Items: []api.Service{
{Spec: api.ServiceSpec{Port: 80, CreateExternalLoadBalancer: true}},
{
ObjectMeta: api.ObjectMeta{Name: "def123", Namespace: api.NamespaceDefault},
Spec: api.ServiceSpec{Port: 80, CreateExternalLoadBalancer: true},
},
},
},
numErrs: 1,
@@ -895,7 +898,10 @@ func TestValidateService(t *testing.T) {
},
existing: api.ServiceList{
Items: []api.Service{
{Spec: api.ServiceSpec{Port: 80}},
{
ObjectMeta: api.ObjectMeta{Name: "def123", Namespace: api.NamespaceDefault},
Spec: api.ServiceSpec{Port: 80},
},
},
},
numErrs: 0,
@@ -911,7 +917,10 @@ func TestValidateService(t *testing.T) {
},
existing: api.ServiceList{
Items: []api.Service{
{Spec: api.ServiceSpec{Port: 80, CreateExternalLoadBalancer: true}},
{
ObjectMeta: api.ObjectMeta{Name: "def123", Namespace: api.NamespaceDefault},
Spec: api.ServiceSpec{Port: 80, CreateExternalLoadBalancer: true},
},
},
},
numErrs: 0,
@@ -927,7 +936,10 @@ func TestValidateService(t *testing.T) {
},
existing: api.ServiceList{
Items: []api.Service{
{Spec: api.ServiceSpec{Port: 80}},
{
ObjectMeta: api.ObjectMeta{Name: "def123", Namespace: api.NamespaceDefault},
Spec: api.ServiceSpec{Port: 80},
},
},
},
numErrs: 0,