Upgrade k8s to v0.30.4 and controller-runtime to v0.18.5

- Refactor code to handle breaking changes
- Run make generate to regenerate code
- Update import paths for compatibility

Author: sujeet01

api/core/v1alpha1/zz_generated.defaults.go

@@ -17,7 +17,7 @@ import (
 	apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
 
 	apinetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
+	ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
 	ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1"
 	networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1"
 	envtestutils "github.com/ironcore-dev/ironcore/utils/envtest"

apinetlet/controllers/controllers_suite_test.go

@@ -11,7 +11,7 @@ import (
 	apinetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
 	"github.com/ironcore-dev/ironcore-net/apimachinery/api/net"
 	apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
-	apinetmetav1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/meta/v1"
+	metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
 
 	commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
@@ -163,19 +163,19 @@ func translateObjectSelector(objSel *corev1alpha1.ObjectSelector) *apinetv1alpha
 		WithMatchExpressions(translateLabelSelectorRequirements(objSel.MatchExpressions)...)
 }
 
-func translateLabelSelectorRequirements(reqs []metav1.LabelSelectorRequirement) []*apinetmetav1ac.LabelSelectorRequirementApplyConfiguration {
-	var translated []*apinetmetav1ac.LabelSelectorRequirementApplyConfiguration
+func translateLabelSelectorRequirements(reqs []metav1.LabelSelectorRequirement) []*metav1ac.LabelSelectorRequirementApplyConfiguration {
+	var translated []*metav1ac.LabelSelectorRequirementApplyConfiguration
 	for _, req := range reqs {
-		translated = append(translated, apinetmetav1ac.LabelSelectorRequirement().
+		translated = append(translated, metav1ac.LabelSelectorRequirement().
 			WithKey(req.Key).
 			WithOperator(req.Operator).
 			WithValues(req.Values...))
 	}
 	return translated
 }
 
-func translateLabelSelector(labelSelector metav1.LabelSelector) *apinetmetav1ac.LabelSelectorApplyConfiguration {
-	return apinetmetav1ac.LabelSelector().
+func translateLabelSelector(labelSelector metav1.LabelSelector) *metav1ac.LabelSelectorApplyConfiguration {
+	return metav1ac.LabelSelector().
 		WithMatchLabels(labelSelector.MatchLabels).
 		WithMatchExpressions(translateLabelSelectorRequirements(labelSelector.MatchExpressions)...)
 }

apinetlet/controllers/conversion.go

@@ -17,8 +17,8 @@ import (
 	apinetlethandler "github.com/ironcore-dev/ironcore-net/apinetlet/handler"
 	"github.com/ironcore-dev/ironcore-net/apinetlet/provider"
 	apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
-	metav1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/meta/v1"
-	"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
+	ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
+	metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
 
 	"github.com/ironcore-dev/controller-utils/clientutils"
 	commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -342,8 +342,11 @@ func (r *LoadBalancerReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.LoadBalancer{}),
-			apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.LoadBalancer{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.LoadBalancer{},
+				apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.LoadBalancer{}),
+			),
 		).
 		Owns(&ipamv1alpha1.Prefix{}).
 		Watches(

apinetlet/controllers/loadbalancer_controller.go

@@ -14,7 +14,7 @@ import (
 	apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
 	"github.com/ironcore-dev/ironcore-net/apinetlet/handler"
 	apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
+	ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
 
 	"github.com/ironcore-dev/controller-utils/clientutils"
 	commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -215,12 +215,18 @@ func (r *NATGatewayReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache ca
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.NATGateway{}),
-			handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.NATGateway{},
+				handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
+			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.NATGatewayAutoscaler{}),
-			handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.NATGatewayAutoscaler{},
+				handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
+			),
 		).
 		Complete(r)
 }

apinetlet/controllers/natgateway_controller.go

@@ -307,8 +307,11 @@ func (r *NetworkReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache cache
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.Network{}),
-			handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.Network{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.Network{},
+				handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.Network{}),
+			),
 		).
 		Complete(r)
 }

apinetlet/controllers/network_controller.go

@@ -581,8 +581,11 @@ func (r *NetworkInterfaceReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCa
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.NetworkInterface{}),
-			apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkInterface{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.NetworkInterface{},
+				apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkInterface{}),
+			),
 		).
 		Owns(&ipamv1alpha1.Prefix{}).
 		Watches(

apinetlet/controllers/networkinterface_controller.go

@@ -15,7 +15,7 @@ import (
 	apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
 	apinetlethandler "github.com/ironcore-dev/ironcore-net/apinetlet/handler"
 	apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
+	ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
 	apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
 
 	"github.com/ironcore-dev/controller-utils/clientutils"
@@ -576,17 +576,26 @@ func (r *NetworkPolicyReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.NetworkPolicy{}),
-			apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkPolicy{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.NetworkPolicy{},
+				apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkPolicy{}),
+			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.Network{}),
-			r.enqueueByNetwork(),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.Network{},
+				r.enqueueByNetwork(),
+			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.NetworkInterface{}),
-			r.enqueueByNetworkInterface(),
-			builder.WithPredicates(r.networkInterfaceReadyPredicate()),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.NetworkInterface{},
+				r.enqueueByNetworkInterface(),
+				r.networkInterfaceReadyPredicate(),
+			),
 		).
 		Complete(r)
 }

apinetlet/controllers/networkpolicy_controller.go

@@ -14,7 +14,7 @@ import (
 	apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
 	"github.com/ironcore-dev/ironcore-net/apinetlet/handler"
 	apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
-	"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
+	ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
 
 	"github.com/ironcore-dev/controller-utils/clientutils"
 	commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -204,8 +204,11 @@ func (r *VirtualIPReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache cac
 			),
 		).
 		WatchesRawSource(
-			source.Kind(apiNetCache, &apinetv1alpha1.IP{}),
-			handler.EnqueueRequestForSource(r.Scheme(), mgr.GetRESTMapper(), &networkingv1alpha1.VirtualIP{}),
+			source.Kind[client.Object](
+				apiNetCache,
+				&apinetv1alpha1.IP{},
+				handler.EnqueueRequestForSource(r.Scheme(), mgr.GetRESTMapper(), &networkingv1alpha1.VirtualIP{}),
+			),
 		).
 		Complete(r)
 }