Use generics in k8s factory functions

clustermesh-apiserver/vmmanager.go

@@ -89,7 +89,7 @@ func (m *VMManager) startCiliumExternalWorkloadWatcher(clientset k8sClient.Clien
 				}
 			},
 		},
-		k8s.TransformToCiliumExternalWorkload,
+		nil,
 	)
 
 	go m.ciliumExternalWorkloadInformer.Run(wait.NeverStop)

operator/cmd/ccnp_event.go

@@ -16,6 +16,7 @@ import (
 	cilium_v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
 	k8sClient "github.com/cilium/cilium/pkg/k8s/client"
 	"github.com/cilium/cilium/pkg/k8s/informer"
+	"github.com/cilium/cilium/pkg/k8s/types"
 	"github.com/cilium/cilium/pkg/k8s/utils"
 	"github.com/cilium/cilium/pkg/k8s/watchers/resources"
 	"github.com/cilium/cilium/pkg/kvstore/store"
@@ -70,7 +71,7 @@ func enableCCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sCli
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
 				k8sEventMetric(resources.MetricCCNP, resources.MetricCreate)
-				if cnp := k8s.ObjToSlimCNP(obj); cnp != nil {
+				if cnp := k8s.CastInformerEvent[types.SlimCNP](obj); cnp != nil {
 					// We need to deepcopy this structure because we are writing
 					// fields.
 					// See https://github.com/cilium/cilium/blob/27fee207f5422c95479422162e9ea0d2f2b6c770/pkg/policy/api/ingress.go#L112-L134
@@ -84,8 +85,8 @@ func enableCCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sCli
 			},
 			UpdateFunc: func(oldObj, newObj interface{}) {
 				k8sEventMetric(resources.MetricCCNP, resources.MetricUpdate)
-				if oldCNP := k8s.ObjToSlimCNP(oldObj); oldCNP != nil {
-					if newCNP := k8s.ObjToSlimCNP(newObj); newCNP != nil {
+				if oldCNP := k8s.CastInformerEvent[types.SlimCNP](oldObj); oldCNP != nil {
+					if newCNP := k8s.CastInformerEvent[types.SlimCNP](newObj); newCNP != nil {
 						if oldCNP.DeepEqual(newCNP) {
 							return
 						}
@@ -102,7 +103,7 @@ func enableCCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sCli
 			},
 			DeleteFunc: func(obj interface{}) {
 				k8sEventMetric(resources.MetricCCNP, resources.MetricDelete)
-				cnp := k8s.ObjToSlimCNP(obj)
+				cnp := k8s.CastInformerEvent[types.SlimCNP](obj)
 				if cnp == nil {
 					return
 				}

operator/cmd/cilium_node.go

@@ -78,7 +78,6 @@ func (s *ciliumNodeSynchronizer) Start(ctx context.Context, wg *sync.WaitGroup)
 		connectedToKVStore     = make(chan struct{})
 
 		resourceEventHandler   = cache.ResourceEventHandlerFuncs{}
-		ciliumNodeConvertFunc  = k8s.TransformToCiliumNode
 		ciliumNodeManagerQueue = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
 		kvStoreQueue           = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
 	)
@@ -183,8 +182,8 @@ func (s *ciliumNodeSynchronizer) Start(ctx context.Context, wg *sync.WaitGroup)
 				}
 			},
 			UpdateFunc: func(oldObj, newObj interface{}) {
-				if oldNode := k8s.ObjToCiliumNode(oldObj); oldNode != nil {
-					if newNode := k8s.ObjToCiliumNode(newObj); newNode != nil {
+				if oldNode := k8s.CastInformerEvent[cilium_v2.CiliumNode](oldObj); oldNode != nil {
+					if newNode := k8s.CastInformerEvent[cilium_v2.CiliumNode](newObj); newNode != nil {
 						if oldNode.DeepEqual(newNode) {
 							return
 						}
@@ -220,10 +219,6 @@ func (s *ciliumNodeSynchronizer) Start(ctx context.Context, wg *sync.WaitGroup)
 				}
 			},
 		}
-	} else {
-		// Since we won't be handling any events we don't need to convert
-		// objects.
-		ciliumNodeConvertFunc = nil
 	}
 
 	// TODO: The operator is currently storing a full copy of the
@@ -235,7 +230,7 @@ func (s *ciliumNodeSynchronizer) Start(ctx context.Context, wg *sync.WaitGroup)
 		&cilium_v2.CiliumNode{},
 		0,
 		resourceEventHandler,
-		ciliumNodeConvertFunc,
+		nil,
 	)
 
 	wg.Add(1)

operator/cmd/cnp_event.go

@@ -16,6 +16,7 @@ import (
 	cilium_v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
 	k8sClient "github.com/cilium/cilium/pkg/k8s/client"
 	"github.com/cilium/cilium/pkg/k8s/informer"
+	"github.com/cilium/cilium/pkg/k8s/types"
 	"github.com/cilium/cilium/pkg/k8s/utils"
 	"github.com/cilium/cilium/pkg/k8s/watchers/resources"
 	"github.com/cilium/cilium/pkg/kvstore/store"
@@ -75,7 +76,7 @@ func enableCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sClie
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
 				k8sEventMetric(resources.MetricCNP, resources.MetricCreate)
-				if cnp := k8s.ObjToSlimCNP(obj); cnp != nil {
+				if cnp := k8s.CastInformerEvent[types.SlimCNP](obj); cnp != nil {
 					// We need to deepcopy this structure because we are writing
 					// fields.
 					// See https://github.com/cilium/cilium/blob/27fee207f5422c95479422162e9ea0d2f2b6c770/pkg/policy/api/ingress.go#L112-L134
@@ -89,8 +90,8 @@ func enableCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sClie
 			},
 			UpdateFunc: func(oldObj, newObj interface{}) {
 				k8sEventMetric(resources.MetricCNP, resources.MetricUpdate)
-				if oldCNP := k8s.ObjToSlimCNP(oldObj); oldCNP != nil {
-					if newCNP := k8s.ObjToSlimCNP(newObj); newCNP != nil {
+				if oldCNP := k8s.CastInformerEvent[types.SlimCNP](oldObj); oldCNP != nil {
+					if newCNP := k8s.CastInformerEvent[types.SlimCNP](newObj); newCNP != nil {
 						if oldCNP.DeepEqual(newCNP) {
 							return
 						}
@@ -107,7 +108,7 @@ func enableCNPWatcher(ctx context.Context, wg *sync.WaitGroup, clientset k8sClie
 			},
 			DeleteFunc: func(obj interface{}) {
 				k8sEventMetric(resources.MetricCNP, resources.MetricDelete)
-				cnp := k8s.ObjToSlimCNP(obj)
+				cnp := k8s.CastInformerEvent[types.SlimCNP](obj)
 				if cnp == nil {
 					return
 				}

operator/cmd/root.go

@@ -46,6 +46,7 @@ import (
 	"github.com/cilium/cilium/pkg/k8s"
 	"github.com/cilium/cilium/pkg/k8s/apis"
 	k8sClient "github.com/cilium/cilium/pkg/k8s/client"
+	slim_corev1 "github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1"
 	k8sversion "github.com/cilium/cilium/pkg/k8s/version"
 	"github.com/cilium/cilium/pkg/kvstore"
 	"github.com/cilium/cilium/pkg/logging"
@@ -532,7 +533,7 @@ func (legacy *legacyOnLeader) onStart(_ hive.HookContext) error {
 									logfields.ServiceNamespace: k8sSvc.Namespace,
 								}).Error("Failed to transform k8s service")
 							} else {
-								slimSvc := k8s.ObjToV1Services(slimSvcObj)
+								slimSvc := k8s.CastInformerEvent[slim_corev1.Service](slimSvcObj)
 								if slimSvc == nil {
 									// This will never happen but still log it
 									scopedLog.WithFields(logrus.Fields{

operator/pkg/ingress/ingress.go

@@ -130,16 +130,16 @@ func NewController(clientset k8sClient.Clientset, options ...Option) (*Controlle
 		0,
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
-				if ingress := k8s.ObjToV1Ingress(obj); ingress != nil {
+				if ingress := k8s.CastInformerEvent[slim_networkingv1.Ingress](obj); ingress != nil {
 					ic.queue.Add(ingressAddedEvent{ingress: ingress})
 				}
 			},
 			UpdateFunc: func(oldObj, newObj interface{}) {
-				oldIngress := k8s.ObjToV1Ingress(oldObj)
+				oldIngress := k8s.CastInformerEvent[slim_networkingv1.Ingress](oldObj)
 				if oldIngress == nil {
 					return
 				}
-				newIngress := k8s.ObjToV1Ingress(newObj)
+				newIngress := k8s.CastInformerEvent[slim_networkingv1.Ingress](newObj)
 				if newIngress == nil {
 					return
 				}
@@ -149,7 +149,7 @@ func NewController(clientset k8sClient.Clientset, options ...Option) (*Controlle
 				ic.queue.Add(ingressUpdatedEvent{oldIngress: oldIngress, newIngress: newIngress})
 			},
 			DeleteFunc: func(obj interface{}) {
-				if ingress := k8s.ObjToV1Ingress(obj); ingress != nil {
+				if ingress := k8s.CastInformerEvent[slim_networkingv1.Ingress](obj); ingress != nil {
 					ic.queue.Add(ingressDeletedEvent{ingress: ingress})
 				}
 			},

operator/pkg/ingress/ingress_class.go

@@ -84,17 +84,17 @@ func (i *ingressClassManager) Run() {
 }
 
 func (i *ingressClassManager) handleAddIngressClass(obj interface{}) {
-	if ic := k8s.ObjToV1IngressClass(obj); ic != nil {
+	if ic := k8s.CastInformerEvent[slim_networkingv1.IngressClass](obj); ic != nil {
 		i.queue.Add(ingressClassAddedEvent{ingressClass: ic})
 	}
 }
 
 func (i *ingressClassManager) handleUpdateIngressClass(oldObj, newObj interface{}) {
-	oldIngressClass := k8s.ObjToV1IngressClass(oldObj)
+	oldIngressClass := k8s.CastInformerEvent[slim_networkingv1.IngressClass](oldObj)
 	if oldIngressClass == nil {
 		return
 	}
-	newIngressClass := k8s.ObjToV1IngressClass(newObj)
+	newIngressClass := k8s.CastInformerEvent[slim_networkingv1.IngressClass](newObj)
 	if newIngressClass == nil {
 		return
 	}
@@ -105,7 +105,7 @@ func (i *ingressClassManager) handleUpdateIngressClass(oldObj, newObj interface{
 }
 
 func (i *ingressClassManager) handleDeleteIngressClass(obj interface{}) {
-	if ic := k8s.ObjToV1IngressClass(obj); ic != nil {
+	if ic := k8s.CastInformerEvent[slim_networkingv1.IngressClass](obj); ic != nil {
 		i.queue.Add(ingressClassDeletedEvent{ingressClass: ic})
 	}
 }

operator/pkg/ingress/secret.go

@@ -98,16 +98,16 @@ func newSyncSecretsManager(clientset k8sClient.Clientset, namespace string, maxR
 		0,
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
-				if secret := k8s.ObjToV1Secret(obj); secret != nil {
+				if secret := k8s.CastInformerEvent[slim_corev1.Secret](obj); secret != nil {
 					manager.queue.Add(secretAddedEvent{secret: secret})
 				}
 			},
 			UpdateFunc: func(oldObj, newObj interface{}) {
-				oldSecret := k8s.ObjToV1Secret(oldObj)
+				oldSecret := k8s.CastInformerEvent[slim_corev1.Secret](oldObj)
 				if oldSecret == nil {
 					return
 				}
-				newSecret := k8s.ObjToV1Secret(newObj)
+				newSecret := k8s.CastInformerEvent[slim_corev1.Secret](newObj)
 				if newSecret == nil {
 					return
 				}
@@ -117,7 +117,7 @@ func newSyncSecretsManager(clientset k8sClient.Clientset, namespace string, maxR
 				manager.queue.Add(secretUpdatedEvent{oldSecret: oldSecret, newSecret: newSecret})
 			},
 			DeleteFunc: func(obj interface{}) {
-				if secret := k8s.ObjToV1Secret(obj); secret != nil {
+				if secret := k8s.CastInformerEvent[slim_corev1.Secret](obj); secret != nil {
 					manager.queue.Add(secretDeletedEvent{secret: secret})
 				}
 			},

operator/pkg/ingress/service.go

@@ -95,17 +95,17 @@ func (sm *serviceManager) getByKey(key string) (*slim_corev1.Service, bool, erro
 }
 
 func (sm *serviceManager) handleAddService(obj interface{}) {
-	if service := k8s.ObjToV1Services(obj); service != nil {
+	if service := k8s.CastInformerEvent[slim_corev1.Service](obj); service != nil {
 		sm.queue.Add(serviceAddedEvent{service: service})
 	}
 }
 
 func (sm *serviceManager) handleUpdateService(oldObj, newObj interface{}) {
-	oldService := k8s.ObjToV1Services(oldObj)
+	oldService := k8s.CastInformerEvent[slim_corev1.Service](oldObj)
 	if oldService == nil {
 		return
 	}
-	newService := k8s.ObjToV1Services(newObj)
+	newService := k8s.CastInformerEvent[slim_corev1.Service](newObj)
 	if newService == nil {
 		return
 	}
@@ -116,7 +116,7 @@ func (sm *serviceManager) handleUpdateService(oldObj, newObj interface{}) {
 }
 
 func (sm *serviceManager) handleDeleteService(obj interface{}) {
-	if service := k8s.ObjToV1Services(obj); service != nil {
+	if service := k8s.CastInformerEvent[slim_corev1.Service](obj); service != nil {
 		sm.queue.Add(serviceDeletedEvent{service: service})
 	}
 }