github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 21:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Chore: add finalizers tweak function

Browse Source
This commit is contained in:
mowangdk 2023-03-26 12:27:28 +08:00
parent 28db34a231
commit 4f8eba2a0b
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go
View File

@ -105,6 +105,12 @@ func tweakAddLBClass(loadBalancerClass *string) serviceTweak {
} }
} }
func tweakAddFinalizers(finalizers ...string) serviceTweak {
return func(s *v1.Service) {
s.ObjectMeta.Finalizers = finalizers
}
}
// 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", v1.ServiceTypeLoadBalancer) return newService("external-balancer", v1.ServiceTypeLoadBalancer)
@ -224,23 +230,7 @@ func TestSyncLoadBalancerIfNeeded(t *testing.T) {
// Finalizer test cases below. // Finalizer test cases below.
{ {
desc: "service with finalizer that no longer wants LB", desc: "service with finalizer that no longer wants LB",
service: &v1.Service{ service: newService("no-external-balancer", v1.ServiceTypeClusterIP, tweakAddLBIngress("8.8.8.8"), tweakAddFinalizers(servicehelper.LoadBalancerCleanupFinalizer)),
ObjectMeta: metav1.ObjectMeta{
Name: "no-external-balancer",
Namespace: "default",
Finalizers: []string{servicehelper.LoadBalancerCleanupFinalizer},
},
Spec: v1.ServiceSpec{
Type: v1.ServiceTypeClusterIP,
},
Status: v1.ServiceStatus{
LoadBalancer: v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "8.8.8.8"},
},
},
},
},
lbExists: true, lbExists: true,
expectOp: deleteLoadBalancer, expectOp: deleteLoadBalancer,
expectDeleteAttempt: true, expectDeleteAttempt: true,
@ -289,20 +279,7 @@ func TestSyncLoadBalancerIfNeeded(t *testing.T) {
}, },
{ {
desc: "service with finalizer that wants LB", desc: "service with finalizer that wants LB",
service: &v1.Service{ service: newService("basic-service1", v1.ServiceTypeLoadBalancer, tweakAddPorts(v1.ProtocolTCP, 0), tweakAddFinalizers(servicehelper.LoadBalancerCleanupFinalizer)),
ObjectMeta: metav1.ObjectMeta{
Name: "basic-service1",
Namespace: "default",
Finalizers: []string{servicehelper.LoadBalancerCleanupFinalizer},
},
Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{{
Port: 80,
Protocol: v1.ProtocolTCP,
}},
Type: v1.ServiceTypeLoadBalancer,
},
},
expectOp: ensureLoadBalancer, expectOp: ensureLoadBalancer,
expectCreateAttempt: true, expectCreateAttempt: true,
expectPatchStatus: true, expectPatchStatus: true,