refactor: unify type constants (#6081)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>

Author: zhangzujian

cmd/controller/controller.go

@@ -25,6 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
+	"github.com/kubeovn/kube-ovn/pkg/apis/kubeovn"
 	kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
 	"github.com/kubeovn/kube-ovn/pkg/controller"
 	"github.com/kubeovn/kube-ovn/pkg/metrics"
@@ -137,7 +138,7 @@ func CmdMain() {
 		Component: ovnLeaderResource,
 		Host:      os.Getenv(util.HostnameEnv),
 	})
-	rl, err := resourcelock.NewFromKubeconfig("leases",
+	rl, err := resourcelock.NewFromKubeconfig(resourcelock.LeasesResourceLock,
 		config.PodNamespace,
 		ovnLeaderResource,
 		resourcelock.ResourceLockConfig{
@@ -183,7 +184,7 @@ func checkPermission(config *controller.Configuration) error {
 			Spec: v1.SelfSubjectAccessReviewSpec{
 				ResourceAttributes: &v1.ResourceAttributes{
 					Verb:     "watch",
-					Group:    "kubeovn.io",
+					Group:    kubeovn.GroupName,
 					Resource: res,
 				},
 			},

pkg/controller/controller.go

@@ -13,10 +13,12 @@ import (
 	"github.com/puzpuzpuz/xsync/v4"
 	"golang.org/x/time/rate"
 	corev1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/discovery"
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/scheme"
 	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
@@ -30,6 +32,7 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/keymutex"
+	"k8s.io/utils/set"
 	v1alpha1 "sigs.k8s.io/network-policy-api/apis/v1alpha1"
 	netpolv1alpha2 "sigs.k8s.io/network-policy-api/apis/v1alpha2"
 	anpinformer "sigs.k8s.io/network-policy-api/pkg/client/informers/externalversions"
@@ -1573,3 +1576,26 @@ func runWorker[T comparable](action string, queue workqueue.TypedRateLimitingInt
 		}
 	}
 }
+
+// apiResourceExists checks if all specified kinds exist in the given group version.
+// It returns true if all kinds are found, false otherwise.
+// Parameters:
+// - discoveryClient: The discovery client to use for querying API resources.
+// - gv: The group version string (e.g., "apps/v1").
+// - kinds: A variadic list of kind names to check for existence (e.g., "Deployment", "StatefulSet").
+func apiResourceExists(discoveryClient discovery.DiscoveryInterface, gv string, kinds ...string) (bool, error) {
+	apiResourceLists, err := discoveryClient.ServerResourcesForGroupVersion(gv)
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return false, nil
+		}
+		return false, fmt.Errorf("failed to discover api resources for %s: %w", gv, err)
+	}
+
+	existingKinds := set.New[string]()
+	for _, apiResource := range apiResourceLists.APIResources {
+		existingKinds.Insert(apiResource.Kind)
+	}
+
+	return existingKinds.HasAll(kinds...), nil
+}

pkg/controller/dns_name_resolver.go

@@ -199,10 +199,6 @@ func (c *Controller) createOrUpdateDNSNameResolver(anpName, domainName string) e
 
 	klog.Infof("Creating or updating DNSNameResolver %s for domain %s in ANP %s", dnsNameResolverName, domainName, anpName)
 	dnsNameResolver := &kubeovnv1.DNSNameResolver{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "DNSNameResolver",
-			APIVersion: "kubeovn.io/v1",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: dnsNameResolverName,
 			Labels: map[string]string{

pkg/controller/gc.go

@@ -334,7 +334,7 @@ func (c *Controller) checkIPOwnerExists(ip *kubeovnv1.IP) (bool, error) {
 	}
 
 	// Check if VM exists
-	if ip.Spec.PodType == util.VM {
+	if ip.Spec.PodType == util.KindVirtualMachine {
 		_, err := c.config.KubevirtClient.VirtualMachine(ip.Spec.Namespace).Get(context.Background(), ip.Spec.PodName, metav1.GetOptions{})
 		if err != nil && k8serrors.IsNotFound(err) {
 			return false, nil
@@ -343,7 +343,7 @@ func (c *Controller) checkIPOwnerExists(ip *kubeovnv1.IP) (bool, error) {
 	}
 
 	// Check if StatefulSet exists
-	if ip.Spec.PodType == util.StatefulSet {
+	if ip.Spec.PodType == util.KindStatefulSet {
 		// Extract StatefulSet name from pod name by removing the last part after '-'
 		// e.g., "vpc-nat-gw-rg-f6d4e7973976430-default-sto-1-0" -> "vpc-nat-gw-rg-f6d4e7973976430-default-sto-1"
 		stsName := ip.Spec.PodName

pkg/controller/init.go

@@ -405,7 +405,8 @@ func (c *Controller) InitIPAM() error {
 			continue
 		}
 		// recover sts and kubevirt vm ip, other ip recover in later pod loop
-		if ip.Spec.PodType != util.StatefulSet && ip.Spec.PodType != util.VM {
+		if ip.Spec.PodType != util.KindStatefulSet &&
+			ip.Spec.PodType != util.KindVirtualMachine {
 			continue
 		}
 
@@ -673,7 +674,7 @@ func (c *Controller) syncIPCR() error {
 		changed := false
 		ip = ip.DeepCopy()
 		if ipMap.Has(ip.Name) && ip.Spec.PodType == "" {
-			ip.Spec.PodType = util.VM
+			ip.Spec.PodType = util.KindVirtualMachine
 			changed = true
 		}
 

pkg/controller/ip.go

@@ -149,7 +149,9 @@ func (c *Controller) handleAddReservedIP(key string) error {
 		return err
 	}
 
-	if ip.Spec.PodType != "" && ip.Spec.PodType != util.VM && ip.Spec.PodType != util.StatefulSet {
+	if ip.Spec.PodType != "" &&
+		ip.Spec.PodType != util.KindVirtualMachine &&
+		ip.Spec.PodType != util.KindStatefulSet {
 		err := fmt.Errorf("podType %s is not supported", ip.Spec.PodType)
 		klog.Error(err)
 		return err

pkg/controller/kubevirt.go

@@ -141,7 +141,7 @@ func (c *Controller) handleAddOrUpdateVMIMigration(key string) error {
 	case kubevirtv1.MigrationScheduling:
 		selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
 			MatchLabels: map[string]string{
-				"kubevirt.io/migrationJobUID": string(vmiMigration.UID),
+				kubevirtv1.MigrationJobLabel: string(vmiMigration.UID),
 			},
 		})
 		if err != nil {
@@ -204,15 +204,13 @@ func (c *Controller) handleAddOrUpdateVMIMigration(key string) error {
 	return nil
 }
 
-func (c *Controller) isKubevirtCRDInstalled() bool {
-	for _, crd := range util.KubeVirtCRD {
-		_, err := c.config.ExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), crd, metav1.GetOptions{})
-		if err != nil {
-			return false
-		}
-	}
-	klog.Info("Found KubeVirt CRDs")
-	return true
+func (c *Controller) isKubevirtCRDInstalled() (bool, error) {
+	return apiResourceExists(c.config.KubevirtClient.Discovery(),
+		kubevirtv1.GroupVersion.String(),
+		util.KindVirtualMachine,
+		util.KindVirtualMachineInstance,
+		util.KindVirtualMachineInstanceMigration,
+	)
 }
 
 func (c *Controller) StartKubevirtInformerFactory(ctx context.Context, kubevirtInformerFactory informer.KubeVirtInformerFactory) {
@@ -222,7 +220,12 @@ func (c *Controller) StartKubevirtInformerFactory(ctx context.Context, kubevirtI
 		for {
 			select {
 			case <-ticker.C:
-				if c.isKubevirtCRDInstalled() {
+				ok, err := c.isKubevirtCRDInstalled()
+				if err != nil {
+					klog.Errorf("checking kubevirt CRD exists: %v", err)
+					continue
+				}
+				if ok {
 					klog.Info("Start kubevirt informer")
 					vmiMigrationInformer := kubevirtInformerFactory.VirtualMachineInstanceMigration()
 					vmInformer := kubevirtInformerFactory.VirtualMachine()

pkg/controller/network_attachment.go

@@ -3,33 +3,23 @@ package controller
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"time"
 
+	nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	"gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging"
 	multustypes "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
 	"github.com/kubeovn/kube-ovn/pkg/util"
 )
 
 func (c *Controller) isNetAttachCRDInstalled() (bool, error) {
-	resources, err := c.config.AttachNetClient.Discovery().ServerResourcesForGroupVersion("k8s.cni.cncf.io/v1")
-	if err != nil {
-		if k8serrors.IsNotFound(err) {
-			return false, nil
-		}
-		return false, fmt.Errorf("getting server resources for k8s.cni.cncf.io/v1; %w", err)
-	}
-
-	for _, resource := range resources.APIResources {
-		if resource.Name == "network-attachment-definitions" {
-			return true, nil
-		}
-	}
-	return false, nil
+	return apiResourceExists(
+		c.config.AttachNetClient.Discovery(),
+		nadv1.SchemeGroupVersion.String(),
+		util.ObjectKind[*nadv1.NetworkAttachmentDefinition](),
+	)
 }
 
 // the network-attachment-definition CRD is not required to be installed so

pkg/controller/pod.go

@@ -16,6 +16,7 @@ import (
 	nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils"
 	"github.com/scylladb/go-set/strset"
+	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -26,6 +27,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
+	kubevirtv1 "kubevirt.io/api/core/v1"
 
 	kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
 	"github.com/kubeovn/kube-ovn/pkg/ipam"
@@ -1049,7 +1051,7 @@ func (c *Controller) handleDeletePod(key string) (err error) {
 			}
 		}
 		if keepIPCR {
-			isDelete, err := appendCheckPodNonMultusNetToDel(c, pod, stsName, util.StatefulSet)
+			isDelete, err := appendCheckPodNonMultusNetToDel(c, pod, stsName, util.KindStatefulSet)
 			if err != nil {
 				klog.Error(err)
 				return err
@@ -1083,7 +1085,7 @@ func (c *Controller) handleDeletePod(key string) (err error) {
 			}
 		}
 		if keepIPCR {
-			isDelete, err := appendCheckPodNonMultusNetToDel(c, pod, vmName, util.VMInstance)
+			isDelete, err := appendCheckPodNonMultusNetToDel(c, pod, vmName, util.KindVirtualMachineInstance)
 			if err != nil {
 				klog.Error(err)
 				return err
@@ -1399,7 +1401,7 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) (*v1.Pod
 
 func isStatefulSetPod(pod *v1.Pod) (bool, string, types.UID) {
 	for _, owner := range pod.OwnerReferences {
-		if owner.Kind == util.StatefulSet && strings.HasPrefix(owner.APIVersion, "apps/") {
+		if owner.Kind == util.KindStatefulSet && strings.HasPrefix(owner.APIVersion, appsv1.SchemeGroupVersion.Group+"/") {
 			if strings.HasPrefix(pod.Name, owner.Name) {
 				return true, owner.Name, owner.UID
 			}
@@ -1543,7 +1545,7 @@ func needAllocateSubnets(pod *v1.Pod, nets []*kubeovnNet) []*kubeovnNet {
 	}
 
 	migrate := false
-	if job, ok := pod.Annotations[util.MigrationJobAnnotation]; ok {
+	if job, ok := pod.Annotations[kubevirtv1.MigrationJobNameAnnotation]; ok {
 		klog.Infof("pod %s/%s is in the migration job %s", pod.Namespace, pod.Name, job)
 		migrate = true
 	}
@@ -1844,7 +1846,7 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 			isDefault := util.IsDefaultNet(pod.Annotations[util.DefaultNetworkAnnotation], attach)
 
 			providerName = fmt.Sprintf("%s.%s.%s", attach.Name, attach.Namespace, util.OvnProvider)
-			if pod.Annotations[util.MigrationJobAnnotation] != "" {
+			if pod.Annotations[kubevirtv1.MigrationJobNameAnnotation] != "" {
 				allowLiveMigration = true
 			}
 
@@ -2222,7 +2224,7 @@ func appendCheckPodNonMultusNetToDel(c *Controller, pod *v1.Pod, ownerRefName, o
 	var ownerRefSubnetExist bool
 	var ownerRefSubnet string
 	switch ownerRefKind {
-	case util.StatefulSet:
+	case util.KindStatefulSet:
 		ss, err := c.config.KubeClient.AppsV1().StatefulSets(pod.Namespace).Get(context.Background(), ownerRefName, metav1.GetOptions{})
 		if err != nil {
 			if k8serrors.IsNotFound(err) {
@@ -2236,7 +2238,7 @@ func appendCheckPodNonMultusNetToDel(c *Controller, pod *v1.Pod, ownerRefName, o
 			ownerRefSubnet = ss.Spec.Template.Annotations[util.LogicalSwitchAnnotation]
 		}
 
-	case util.VMInstance:
+	case util.KindVirtualMachineInstance:
 		vm, err := c.config.KubevirtClient.VirtualMachine(pod.Namespace).Get(context.Background(), ownerRefName, metav1.GetOptions{})
 		if err != nil {
 			if k8serrors.IsNotFound(err) {
@@ -2311,7 +2313,8 @@ func appendCheckPodNonMultusNetToDel(c *Controller, pod *v1.Pod, ownerRefName, o
 func isVMPod(pod *v1.Pod) (bool, string) {
 	for _, owner := range pod.OwnerReferences {
 		// The name of vmi is consistent with vm's name.
-		if owner.Kind == util.VMInstance && strings.HasPrefix(owner.APIVersion, "kubevirt.io") {
+		if owner.Kind == util.KindVirtualMachineInstance &&
+			strings.HasPrefix(owner.APIVersion, kubevirtv1.SchemeGroupVersion.Group+"/") {
 			return true, owner.Name
 		}
 	}
@@ -2320,7 +2323,8 @@ func isVMPod(pod *v1.Pod) (bool, string) {
 
 func isOwnsByTheVM(vmi metav1.Object) (bool, string) {
 	for _, owner := range vmi.GetOwnerReferences() {
-		if owner.Kind == util.VM && strings.HasPrefix(owner.APIVersion, "kubevirt.io") {
+		if owner.Kind == util.KindVirtualMachine &&
+			strings.HasPrefix(owner.APIVersion, kubevirtv1.SchemeGroupVersion.Group+"/") {
 			return true, owner.Name
 		}
 	}
@@ -2422,11 +2426,11 @@ func (c *Controller) getNsAvailableSubnets(pod *v1.Pod, podNet *kubeovnNet) ([]*
 
 func getPodType(pod *v1.Pod) string {
 	if ok, _, _ := isStatefulSetPod(pod); ok {
-		return util.StatefulSet
+		return util.KindStatefulSet
 	}
 
 	if isVMPod, _ := isVMPod(pod); isVMPod {
-		return util.VM
+		return util.KindVirtualMachine
 	}
 	return ""
 }

pkg/daemon/controller.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 	k8sexec "k8s.io/utils/exec"
+	kubevirtv1 "kubevirt.io/api/core/v1"
 
 	kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
 	kubeovninformer "github.com/kubeovn/kube-ovn/pkg/client/informers/externalversions"
@@ -766,7 +767,7 @@ func (c *Controller) gcInterfaces() {
 			// The actual launcher pod has the label 'vm.kubevirt.io/name' with the VM name as value.
 			// Try to find launcher pods by this label.
 			if k8serrors.IsNotFound(err) {
-				selector := labels.SelectorFromSet(map[string]string{util.KubeVirtVMNameLabel: podName})
+				selector := labels.SelectorFromSet(map[string]string{kubevirtv1.DeprecatedVirtualMachineNameLabel: podName})
 				launcherPods, listErr := c.podsLister.Pods(podNamespace).List(selector)
 				if listErr != nil {
 					klog.Errorf("failed to list launcher pods for vm %s/%s: %v", podNamespace, podName, listErr)