github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Fixes service controller unit test for patching

Browse Source 
Co-authored-by: Josh Horwitz <horwitzja@gmail.com>
This commit is contained in:
Zihong Zheng 2019-05-16 11:14:20 -07:00
parent bff5f08e19
commit cda73ebbb0
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/controller/service/service_controller_test.go
View File

@ -23,7 +23,7 @@ import (
"strings" "strings"
"testing" "testing"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -40,14 +40,22 @@ import (
const region = "us-central" const region = "us-central"
func newService(name string, uid types.UID, serviceType v1.ServiceType) *v1.Service { func newService(name string, uid types.UID, serviceType v1.ServiceType) *v1.Service {
return &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "default", UID: uid, SelfLink: testapi.Default.SelfLink("services", name)}, Spec: v1.ServiceSpec{Type: serviceType}} return &v1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: "default",
UID: uid,
SelfLink: testapi.Default.SelfLink("services", name),
},
Spec: v1.ServiceSpec{
Type: serviceType,
},
}
} }
//Wrap newService so that you don't have to call default arguments again and again. //Wrap newService so that you don't have to call default arguments again and again.
func defaultExternalService() *v1.Service { func defaultExternalService() *v1.Service {
return newService("external-balancer", types.UID("123"), v1.ServiceTypeLoadBalancer) return newService("external-balancer", types.UID("123"), v1.ServiceTypeLoadBalancer)
} }
func alwaysReady() bool { return true } func alwaysReady() bool { return true }
@ -151,7 +159,13 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
for _, item := range table { for _, item := range table {
controller, cloud, client := newController() controller, cloud, client := newController()
err := controller.syncLoadBalancerIfNeeded("foo/bar", item.service) key := fmt.Sprintf("%s/%s", item.service.Namespace, item.service.Name)
if _, err := client.CoreV1().Services(item.service.Namespace).Create(item.service); err != nil {
t.Errorf("Failed to prepare service %s for testing: %v", key, err)
continue
}
client.ClearActions()
err := controller.syncLoadBalancerIfNeeded(key, item.service)
if !item.expectErr && err != nil { if !item.expectErr && err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} else if item.expectErr && err == nil { } else if item.expectErr && err == nil {
@ -185,12 +199,12 @@ func TestCreateExternalLoadBalancer(t *testing.T) {
} }
actionFound := false actionFound := false
for _, action := range actions { for _, action := range actions {
if action.GetVerb() == "update" && action.GetResource().Resource == "services" { if action.GetVerb() == "patch" && action.GetResource().Resource == "services" {
actionFound = true actionFound = true
} }
} }
if !actionFound { if !actionFound {
t.Errorf("expected updated service to be sent to client, got these actions instead: %v", actions) t.Errorf("expected patch service to be sent to client, got these actions instead: %v", actions)
} }
} }
} }
@ -326,7 +340,7 @@ func TestGetNodeConditionPredicate(t *testing.T) {
} }
func TestProcessServiceUpdate(t *testing.T) { func TestProcessServiceUpdate(t *testing.T) {
var controller *ServiceController controller, _, client := newController()
//A pair of old and new loadbalancer IP address //A pair of old and new loadbalancer IP address
oldLBIP := "192.168.1.1" oldLBIP := "192.168.1.1"
@ -345,7 +359,6 @@ func TestProcessServiceUpdate(t *testing.T) {
svc: defaultExternalService(), svc: defaultExternalService(),
updateFn: func(svc *v1.Service) *v1.Service { updateFn: func(svc *v1.Service) *v1.Service {
controller, _, _ = newController()
controller.cache.getOrCreate("validKey") controller.cache.getOrCreate("validKey")
return svc return svc
@ -404,6 +417,9 @@ func TestProcessServiceUpdate(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
newSvc := tc.updateFn(tc.svc) newSvc := tc.updateFn(tc.svc)
if _, err := client.CoreV1().Services(tc.svc.Namespace).Create(tc.svc); err != nil {
t.Fatalf("Failed to prepare service %s for testing: %v", tc.key, err)
}
svcCache := controller.cache.getOrCreate(tc.key) svcCache := controller.cache.getOrCreate(tc.key)
obtErr := controller.processServiceUpdate(svcCache, newSvc, tc.key) obtErr := controller.processServiceUpdate(svcCache, newSvc, tc.key)
if err := tc.expectedFn(newSvc, obtErr); err != nil { if err := tc.expectedFn(newSvc, obtErr); err != nil {