Fix translator provisioning (#2953)

Signed-off-by: jose.vazquez <[email protected]>

Author: josvazg

internal/generated/controller/cluster/cluster_controller.go

@@ -15,6 +15,8 @@
 package cluster
 
 import (
+	"fmt"
+
 	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
 	zap "go.uber.org/zap"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
@@ -24,10 +26,21 @@ import (
 	atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
 	reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
 	crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
+	crds "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/generated/crds"
 	akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
 	ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
 )
 
+const (
+	// crdVersion of the controler
+	crdVersion = "v1"
+)
+
+var (
+	// sdkVersions supported by this controller
+	sdkVersions = []string{"v20250312"}
+)
+
 // +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=clusters,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=clusters/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=atlas.generated.mongodb.com,resources=clusters/finalizers,verbs=update
@@ -45,10 +58,26 @@ type Handler struct {
 	reconciler.AtlasReconciler
 	deletionProtection bool
 	predicates         []predicate.Predicate
+	translators        map[string]crapi.Translator
 	handlerv20250312   ctrlstate.VersionedHandlerFunc[v20250312sdk.APIClient, akov2generated.Cluster]
 }
 
-func NewClusterReconciler(c cluster.Cluster, atlasProvider atlas.Provider, logger *zap.Logger, globalSecretRef client.ObjectKey, deletionProtection bool, reapplySupport bool, predicates []predicate.Predicate) *ctrlstate.Reconciler[akov2generated.Cluster] {
+func NewClusterReconciler(
+	c cluster.Cluster,
+	atlasProvider atlas.Provider,
+	logger *zap.Logger,
+	globalSecretRef client.ObjectKey,
+	deletionProtection bool,
+	reapplySupport bool,
+	predicates []predicate.Predicate) (*ctrlstate.Reconciler[akov2generated.Cluster], error) {
+	crd, err := crds.EmbeddedCRD("Cluster")
+	if err == nil {
+		return nil, fmt.Errorf("failed to read CRD for Cluster: %w", err)
+	}
+	translators, err := crapi.NewPerVersionTranslators(crd, crdVersion, sdkVersions...)
+	if err == nil {
+		return nil, fmt.Errorf("failed to get translator set for Cluster: %w", err)
+	}
 	// Create main handler dispatcher
 	clusterHandler := &Handler{
 		AtlasReconciler: reconciler.AtlasReconciler{
@@ -60,10 +89,11 @@ func NewClusterReconciler(c cluster.Cluster, atlasProvider atlas.Provider, logge
 		deletionProtection: deletionProtection,
 		handlerv20250312:   handlerv20250312Func,
 		predicates:         predicates,
+		translators:        translators,
 	}
 
-	return ctrlstate.NewStateReconciler(clusterHandler, ctrlstate.WithCluster[akov2generated.Cluster](c), ctrlstate.WithReapplySupport[akov2generated.Cluster](reapplySupport))
+	return ctrlstate.NewStateReconciler(clusterHandler, ctrlstate.WithCluster[akov2generated.Cluster](c), ctrlstate.WithReapplySupport[akov2generated.Cluster](reapplySupport)), nil
 }
-func handlerv20250312Func(kubeClient client.Client, atlasClient *v20250312sdk.APIClient, translatorRequest *crapi.Request, deletionProtection bool) ctrlstate.StateHandler[akov2generated.Cluster] {
-	return NewHandlerv20250312(kubeClient, atlasClient, translatorRequest, deletionProtection)
+func handlerv20250312Func(kubeClient client.Client, atlasClient *v20250312sdk.APIClient, translator crapi.Translator, deletionProtection bool) ctrlstate.StateHandler[akov2generated.Cluster] {
+	return NewHandlerv20250312(kubeClient, atlasClient, translator, deletionProtection)
 }

internal/generated/controller/cluster/handler.go

@@ -16,9 +16,9 @@ package cluster
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	builder "sigs.k8s.io/controller-runtime/pkg/builder"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
@@ -29,7 +29,6 @@ import (
 
 	atlas "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
 	reconciler "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
-	crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
 	indexers "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/generated/indexers"
 	indexer "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/indexer"
 	akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
@@ -49,12 +48,12 @@ func (h *Handler) getHandlerForResource(ctx context.Context, cluster *akov2gener
 	var selectedHandler ctrlstate.StateHandler[akov2generated.Cluster]
 
 	if cluster.Spec.V20250312 != nil {
-		translationReq, err := getTranslationRequest(ctx, h.Client, "clusters.atlas.generated.mongodb.com", "v1", "v20250312")
-		if err != nil {
-			return nil, err
+		translator, ok := h.translators["v20250312"]
+		if ok != true {
+			return nil, errors.New("unsupported version v20250312 set in CR")
 		}
 		versionCount++
-		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translationReq, h.deletionProtection)
+		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)
 	}
 
 	if versionCount == 0 {
@@ -186,23 +185,3 @@ func (h *Handler) getSDKClientSet(ctx context.Context, cluster *akov2generated.C
 
 	return clientSet, nil
 }
-
-// getTranslationRequest creates a translation request for converting entities between API and AKO.
-// This is a package-level function that can be called from any handler.
-func getTranslationRequest(ctx context.Context, kubeClient client.Client, crdName string, storageVersion string, targetVersion string) (*crapi.Request, error) {
-	crd := &apiextensionsv1.CustomResourceDefinition{}
-	err := kubeClient.Get(ctx, client.ObjectKey{Name: crdName}, crd)
-	if err != nil {
-		return nil, fmt.Errorf("failed to resolve CRD %s: %w", crdName, err)
-	}
-
-	translator, err := crapi.NewTranslator(crd, storageVersion, targetVersion)
-	if err != nil {
-		return nil, fmt.Errorf("failed to setup translator: %w", err)
-	}
-
-	return &crapi.Request{
-		Dependencies: nil,
-		Translator:   translator,
-	}, nil
-}

internal/generated/controller/cluster/handler_v20250312.go

@@ -24,7 +24,7 @@ import (
 	controller "sigs.k8s.io/controller-runtime/pkg/controller"
 	reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	translate "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
+	crapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/crapi"
 	akov2generated "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
 	ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
 	result "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result"
@@ -34,16 +34,16 @@ import (
 type Handlerv20250312 struct {
 	kubeClient         client.Client
 	atlasClient        *v20250312sdk.APIClient
-	translationRequest *translate.Request
+	translator         crapi.Translator
 	deletionProtection bool
 }
 
-func NewHandlerv20250312(kubeClient client.Client, atlasClient *v20250312sdk.APIClient, translationRequest *translate.Request, deletionProtection bool) *Handlerv20250312 {
+func NewHandlerv20250312(kubeClient client.Client, atlasClient *v20250312sdk.APIClient, translator crapi.Translator, deletionProtection bool) *Handlerv20250312 {
 	return &Handlerv20250312{
 		atlasClient:        atlasClient,
 		deletionProtection: deletionProtection,
 		kubeClient:         kubeClient,
-		translationRequest: translationRequest,
+		translator:         translator,
 	}
 }