github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reconcile when service already exists

pull/6/head
deads2k 2016-11-21 12:47:29 -05:00
parent a111bd7690
commit ea8ad3e349
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/master/BUILD
View File

@ -117,7 +117,6 @@ go_test(
"//pkg/generated/openapi:go_default_library",
"//pkg/genericapiserver:go_default_library",
"//pkg/kubelet/client:go_default_library",
"//pkg/registry/registrytest:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/storage/etcd/testing:go_default_library",

4
pkg/master/controller.go
View File

@ -265,8 +265,8 @@ func (c *Controller) CreateOrUpdateMasterServiceIfNeeded(serviceName string, ser
}
_, err := c.ServiceClient.Services(api.NamespaceDefault).Create(svc)
if err != nil && errors.IsAlreadyExists(err) {
err = nil
if errors.IsAlreadyExists(err) {
return c.CreateOrUpdateMasterServiceIfNeeded(serviceName, serviceIP, servicePorts, serviceType, reconcile)
}
return err
}

20
pkg/master/controller_test.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package master
import (
"errors"
"net"
"reflect"
"testing"
@ -25,7 +24,6 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/client/testing/core"
"k8s.io/kubernetes/pkg/registry/registrytest"
"k8s.io/kubernetes/pkg/util/intstr"
)
@ -578,10 +576,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
for _, test := range create_tests {
master := Controller{}
registry := &registrytest.ServiceRegistry{
Err: errors.New("unable to get svc"),
}
master.ServiceRegistry = registry
fakeClient := fake.NewSimpleClientset()
master.ServiceClient = fakeClient.Core()
master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, false)
@ -602,7 +596,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
}
if test.expectCreate == nil && len(creates) > 1 {
t.Errorf("case %q: no create expected, yet saw: %v", test.testName, registry.List.Items)
t.Errorf("case %q: no create expected, yet saw: %v", test.testName, creates)
}
}
@ -864,10 +858,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
for _, test := range reconcile_tests {
master := Controller{}
registry := &registrytest.ServiceRegistry{
Service: test.service,
}
master.ServiceRegistry = registry
fakeClient := fake.NewSimpleClientset(test.service)
master.ServiceClient = fakeClient.Core()
err := master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, true)
@ -891,7 +881,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
}
if test.expectUpdate == nil && len(updates) > 0 {
t.Errorf("case %q: no update expected, yet saw: %v", test.testName, registry.Updates)
t.Errorf("case %q: no update expected, yet saw: %v", test.testName, updates)
}
}
@ -927,10 +917,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
for _, test := range non_reconcile_tests {
master := Controller{}
registry := &registrytest.ServiceRegistry{
Service: test.service,
}
master.ServiceRegistry = registry
fakeClient := fake.NewSimpleClientset(test.service)
master.ServiceClient = fakeClient.Core()
err := master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, false)
@ -954,7 +940,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
}
}
if test.expectUpdate == nil && len(updates) > 0 {
t.Errorf("case %q: no update expected, yet saw: %v", test.testName, registry.Updates)
t.Errorf("case %q: no update expected, yet saw: %v", test.testName, updates)
}
}
}