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

Extract interface for master endpoints reconciler.

Browse Source 
Make the master endpoints reconciler an interface so its implementation can be overridden, if
desired.
This commit is contained in:
Andy Goldstein
2016-06-06 17:48:22 -04:00
parent b6b079b1e9
commit 04ce042ff9
4 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/master/controller_test.go
View File

@@ -371,12 +371,11 @@ func TestReconcileEndpoints(t *testing.T) {
},
}
for _, test := range reconcile_tests {
master := Controller{MasterCount: test.additionalMasters + 1}
registry := &registrytest.EndpointRegistry{
Endpoints: test.endpoints,
}
master.EndpointRegistry = registry
err := master.ReconcileEndpoints(test.serviceName, net.ParseIP(test.ip), test.endpointPorts, true)
reconciler := NewMasterCountEndpointReconciler(test.additionalMasters+1, registry)
err := reconciler.ReconcileEndpoints(test.serviceName, net.ParseIP(test.ip), test.endpointPorts, true)
if err != nil {
t.Errorf("case %q: unexpected error: %v", test.testName, err)
}
@@ -461,12 +460,11 @@ func TestReconcileEndpoints(t *testing.T) {
},
}
for _, test := range non_reconcile_tests {
master := Controller{MasterCount: test.additionalMasters + 1}
registry := &registrytest.EndpointRegistry{
Endpoints: test.endpoints,
}
master.EndpointRegistry = registry
err := master.ReconcileEndpoints(test.serviceName, net.ParseIP(test.ip), test.endpointPorts, false)
reconciler := NewMasterCountEndpointReconciler(test.additionalMasters+1, registry)
err := reconciler.ReconcileEndpoints(test.serviceName, net.ParseIP(test.ip), test.endpointPorts, false)
if err != nil {
t.Errorf("case %q: unexpected error: %v", test.testName, err)
}
@@ -519,7 +517,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
}
for _, test := range create_tests {
master := Controller{MasterCount: 1}
master := Controller{}
registry := &registrytest.ServiceRegistry{
Err: errors.New("unable to get svc"),
}
@@ -794,7 +792,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
}
for _, test := range reconcile_tests {
master := Controller{MasterCount: 1}
master := Controller{}
registry := &registrytest.ServiceRegistry{
Service: test.service,
}
@@ -846,7 +844,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
},
}
for _, test := range non_reconcile_tests {
master := Controller{MasterCount: 1}
master := Controller{}
registry := &registrytest.ServiceRegistry{
Service: test.service,
}