refactor(imports): openv1alpha1 to clustersv1alpha1

Author: maximiliantech

cmd/cluster-provider-kind/main.go

@@ -38,7 +38,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	openv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
+	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 
 	"github.com/openmcp-project/cluster-provider-kind/api/crds"
 	kindv1alpha1 "github.com/openmcp-project/cluster-provider-kind/api/v1alpha1"
@@ -57,7 +57,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(kindv1alpha1.AddToScheme(scheme))
-	utilruntime.Must(openv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(clustersv1alpha1.AddToScheme(scheme))
 
 	utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme

internal/controller/accessrequest_controller.go

@@ -30,7 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	openv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
+	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 
 	"github.com/openmcp-project/cluster-provider-kind/pkg/kind"
 )
@@ -55,7 +55,7 @@ type AccessRequestReconciler struct {
 func (r *AccessRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = logf.FromContext(ctx)
 
-	ar := &openv1alpha1.AccessRequest{}
+	ar := &clustersv1alpha1.AccessRequest{}
 	if err := r.Get(ctx, req.NamespacedName, ar); err != nil {
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil
@@ -64,7 +64,7 @@ func (r *AccessRequestReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 
 	clusterRef := types.NamespacedName{Name: ar.Spec.ClusterRef.Name, Namespace: ar.Namespace}
-	cluster := &openv1alpha1.Cluster{}
+	cluster := &clustersv1alpha1.Cluster{}
 	if err := r.Get(ctx, clusterRef, cluster); err != nil {
 		return ctrl.Result{}, errors.Join(err, errFailedToGetReferencedCluster)
 	}
@@ -99,7 +99,7 @@ func (r *AccessRequestReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 // SetupWithManager sets up the controller with the Manager.
 func (r *AccessRequestReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&openv1alpha1.AccessRequest{}).
+		For(&clustersv1alpha1.AccessRequest{}).
 		Named("accessrequest").
 		Complete(r)
 }

internal/controller/cluster_controller.go

@@ -30,7 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	openv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
+	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 	commonapi "github.com/openmcp-project/openmcp-operator/api/common"
 
 	"github.com/openmcp-project/cluster-provider-kind/pkg/kind"
@@ -40,7 +40,7 @@ import (
 
 var (
 	// Finalizer is the finalizer for Cluster
-	Finalizer = openv1alpha1.GroupVersion.Group + "/finalizer"
+	Finalizer = clustersv1alpha1.GroupVersion.Group + "/finalizer"
 )
 
 // ClusterReconciler reconciles a Cluster object
@@ -62,7 +62,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	log.Info("Reconcile")
 	defer log.Info("Done")
 
-	cluster := &openv1alpha1.Cluster{}
+	cluster := &clustersv1alpha1.Cluster{}
 	if err := r.Get(ctx, req.NamespacedName, cluster); err != nil {
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil
@@ -83,7 +83,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	return r.handleCreateOrUpdate(ctx, cluster)
 }
 
-func (r *ClusterReconciler) handleDelete(ctx context.Context, cluster *openv1alpha1.Cluster) (ctrl.Result, error) {
+func (r *ClusterReconciler) handleDelete(ctx context.Context, cluster *clustersv1alpha1.Cluster) (ctrl.Result, error) {
 	requeue := smartrequeue.FromContext(ctx)
 	cluster.Status.Phase = commonapi.StatusPhaseTerminating
 
@@ -114,7 +114,7 @@ func (r *ClusterReconciler) handleDelete(ctx context.Context, cluster *openv1alp
 }
 
 //nolint:gocyclo
-func (r *ClusterReconciler) handleCreateOrUpdate(ctx context.Context, cluster *openv1alpha1.Cluster) (ctrl.Result, error) {
+func (r *ClusterReconciler) handleCreateOrUpdate(ctx context.Context, cluster *clustersv1alpha1.Cluster) (ctrl.Result, error) {
 	requeue := smartrequeue.FromContext(ctx)
 	cluster.Status.Phase = commonapi.StatusPhaseProgressing
 
@@ -201,12 +201,12 @@ func (r *ClusterReconciler) handleCreateOrUpdate(ctx context.Context, cluster *o
 // SetupWithManager sets up the controller with the Manager.
 func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&openv1alpha1.Cluster{}).
+		For(&clustersv1alpha1.Cluster{}).
 		Named("cluster").
 		Complete(r)
 }
 
-func (r *ClusterReconciler) assignSubnet(ctx context.Context, cluster *openv1alpha1.Cluster) error {
+func (r *ClusterReconciler) assignSubnet(ctx context.Context, cluster *clustersv1alpha1.Cluster) error {
 	_, ok := cluster.Annotations[kind.AnnotationAssignedSubnet]
 	if ok {
 		return nil
@@ -221,7 +221,7 @@ func (r *ClusterReconciler) assignSubnet(ctx context.Context, cluster *openv1alp
 	return r.Update(ctx, cluster)
 }
 
-func kindName(cluster *openv1alpha1.Cluster) string {
+func kindName(cluster *clustersv1alpha1.Cluster) string {
 	return fmt.Sprintf("%s.%s", namespaceOrDefault(cluster.Namespace), cluster.Name)
 }
 

pkg/kind/networking.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	openv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
+	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -27,7 +27,8 @@ var (
 	errNoSubnetsAvailable  = errors.New("no subnets available")
 	errInvalidIP           = errors.New("invalid textual representation of an IP address")
 
-	AnnotationAssignedSubnet = openv1alpha1.GroupVersion.Group + "/assigned-subnet"
+	// AnnotationAssignedSubnet is the annotation used to store the assigned subnet for a cluster
+	AnnotationAssignedSubnet = clustersv1alpha1.GroupVersion.Group + "/assigned-subnet"
 	lockListClusters         = sync.Mutex{}
 )
 
@@ -89,7 +90,7 @@ func NextAvailableLBNetwork(ctx context.Context, c client.Client) (net.IPNet, er
 		return net.IPNet{}, err
 	}
 
-	clusters := &openv1alpha1.ClusterList{}
+	clusters := &clustersv1alpha1.ClusterList{}
 	if err := c.List(ctx, clusters); err != nil {
 		return net.IPNet{}, err
 	}
@@ -132,7 +133,7 @@ func calculateV4Subnet(input net.IPNet, offset int) (net.IPNet, error) {
 	}, nil
 }
 
-func isIpNetTaken(ipnet net.IPNet, clusters *openv1alpha1.ClusterList) (bool, error) {
+func isIpNetTaken(ipnet net.IPNet, clusters *clustersv1alpha1.ClusterList) (bool, error) {
 	for _, c := range clusters.Items {
 		cNet, err := SubnetFromCluster(&c)
 		if err != nil {
@@ -148,7 +149,7 @@ func isIpNetTaken(ipnet net.IPNet, clusters *openv1alpha1.ClusterList) (bool, er
 	return false, nil
 }
 
-func SubnetFromCluster(c *openv1alpha1.Cluster) (*net.IPNet, error) {
+func SubnetFromCluster(c *clustersv1alpha1.Cluster) (*net.IPNet, error) {
 	ipNetStr, ok := c.Annotations[AnnotationAssignedSubnet]
 	if !ok {
 		return nil, nil

pkg/smartrequeue/example_test.go

@@ -27,6 +27,7 @@ func Example_controllerUsage() {
 		inProgress := false  // This would be determined by your logic
 		errOccurred := false // This would be determined by your logic
 
+		// nolint:gocritic
 		if errOccurred {
 			// Handle error case
 			err := fmt.Errorf("something went wrong")