14547474456

Committed 19 Apr 2025 08:37AM UTC coverage: 21.73% (-0.007%) from 21.737%

Build # 14547474456

Build Type

push

github

Committed by

web-flow

Commit Message

modernize: simplify code by using modern constructs (#5163)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Run Details

87 of 376 new or added lines in 94 files covered. (23.14%)

1 existing line in 1 file now uncovered.

10251 of 47175 relevant lines covered (21.73%)

0.25 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

47.83

/pkg/controller/deployment.go

package controller

import (
        "reflect"

        appsv1 "k8s.io/api/apps/v1"
        "k8s.io/apimachinery/pkg/types"
        "k8s.io/klog/v2"

        kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
)

var (
        deploymentGroupVersion       string
        deploymentKind               string
        vpcEgressGatewayGroupVersion string
        vpcEgressGatewayKind         string
)

func init() {
        name := reflect.TypeOf(&appsv1.Deployment{}).Elem().Name()
        gvk := appsv1.SchemeGroupVersion.WithKind(name)
        deploymentGroupVersion = gvk.GroupVersion().String()
        deploymentKind = gvk.Kind

        name = reflect.TypeOf(&kubeovnv1.VpcEgressGateway{}).Elem().Name()
        gvk = kubeovnv1.SchemeGroupVersion.WithKind(name)
        vpcEgressGatewayGroupVersion = gvk.GroupVersion().String()
        vpcEgressGatewayKind = gvk.Kind
}

func (c *Controller) enqueueAddDeployment(obj any) {
        deploy := obj.(*appsv1.Deployment)
        for _, ref := range deploy.OwnerReferences {
                if ref.APIVersion == vpcEgressGatewayGroupVersion && ref.Kind == vpcEgressGatewayKind {
                        key := types.NamespacedName{Namespace: deploy.Namespace, Name: ref.Name}.String()
                        klog.V(3).Infof("enqueue update vpc-egress-gateway %s", key)
                        c.addOrUpdateVpcEgressGatewayQueue.Add(key)
                        return
                }
        }
}

func (c *Controller) enqueueUpdateDeployment(_, newObj any) {
        c.enqueueAddDeployment(newObj)
}

1	package controller
2
3	import (
4	"reflect"
5
6	appsv1 "k8s.io/api/apps/v1"
7	"k8s.io/apimachinery/pkg/types"
8	"k8s.io/klog/v2"
9
10	kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
11	)
12
13	var (
14	deploymentGroupVersion string
15	deploymentKind string
16	vpcEgressGatewayGroupVersion string
17	vpcEgressGatewayKind string
18	)
19
20	func init() {	1✔
21	name := reflect.TypeOf(&appsv1.Deployment{}).Elem().Name()	1✔
22	gvk := appsv1.SchemeGroupVersion.WithKind(name)	1✔
23	deploymentGroupVersion = gvk.GroupVersion().String()	1✔
24	deploymentKind = gvk.Kind	1✔
25		1✔
26	name = reflect.TypeOf(&kubeovnv1.VpcEgressGateway{}).Elem().Name()	1✔
27	gvk = kubeovnv1.SchemeGroupVersion.WithKind(name)	1✔
28	vpcEgressGatewayGroupVersion = gvk.GroupVersion().String()	1✔
29	vpcEgressGatewayKind = gvk.Kind	1✔
30	}	1✔
31
NEW 32	func (c *Controller) enqueueAddDeployment(obj any) {	×
33	deploy := obj.(*appsv1.Deployment)	×
34	for _, ref := range deploy.OwnerReferences {	×
35	if ref.APIVersion == vpcEgressGatewayGroupVersion && ref.Kind == vpcEgressGatewayKind {	×
36	key := types.NamespacedName{Namespace: deploy.Namespace, Name: ref.Name}.String()	×
37	klog.V(3).Infof("enqueue update vpc-egress-gateway %s", key)	×
38	c.addOrUpdateVpcEgressGatewayQueue.Add(key)	×
39	return	×
40	}	×
41	}
42	}
43
NEW 44	func (c *Controller) enqueueUpdateDeployment(_, newObj any) {	×
45	c.enqueueAddDeployment(newObj)	×
46	}	×

kubeovn / kube-ovn / 14547474456

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous