Update deployment validation to account for flex

mongodb · Jan 13, 2025 · 8ac2bee · 8ac2bee
1 parent 9a53e92
commit 8ac2bee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/pkg/controller/atlasdatabaseuser/databaseuser_test.go b/pkg/controller/atlasdatabaseuser/databaseuser_test.go
@@ -13,6 +13,7 @@ import (
 	"go.mongodb.org/atlas-sdk/v20231115008/admin"
 	"go.mongodb.org/atlas-sdk/v20231115008/mockadmin"
 	adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin"
+
 	//mockadminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/mockadmin"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"

diff --git a/pkg/controller/atlasdeployment/atlasdeployment_controller.go b/pkg/controller/atlasdeployment/atlasdeployment_controller.go
@@ -160,6 +160,7 @@ func (r *AtlasDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 	isServerless := atlasDeployment.IsServerless()
 	isFlex := atlasDeployment.IsFlex()
+
 	wasDeleted := !atlasDeployment.GetDeletionTimestamp().IsZero()
 	existsInAtlas := deploymentInAtlas != nil
 

diff --git a/pkg/controller/validate/deployment.go b/pkg/controller/validate/deployment.go
@@ -14,20 +14,24 @@ import (
 func AtlasDeployment(atlasDeployment *akov2.AtlasDeployment, isGov bool, regionUsageRestrictions string) error {
 	isRegularDeployment := atlasDeployment.Spec.DeploymentSpec != nil
 	isServerlessDeployment := atlasDeployment.Spec.ServerlessSpec != nil
+	isFlexDeployment := atlasDeployment.Spec.FlexSpec != nil
 	var err error
 	var tagsSpec []*akov2.TagSpec
 
 	switch {
-	case !isRegularDeployment && !isServerlessDeployment:
-		return errors.New("expected exactly one of spec.deploymentSpec or spec.serverlessSpec to be present, but none were")
-	case isRegularDeployment && isServerlessDeployment:
-		return errors.New("expected exactly one of spec.deploymentSpec or spec.serverlessSpec to be present, but none were")
-	case !isRegularDeployment && isServerlessDeployment:
+	case !isRegularDeployment && !isServerlessDeployment && !isFlexDeployment:
+		return errors.New("expected exactly one of spec.deploymentSpec or spec.serverlessSpec or spec.flexSpec to be present, but none were")
+	case isRegularDeployment && !isServerlessDeployment && !isFlexDeployment:
+		tagsSpec = atlasDeployment.Spec.DeploymentSpec.Tags
+		err = regularDeployment(atlasDeployment.Spec.DeploymentSpec, isGov, regionUsageRestrictions)
+	case !isRegularDeployment && isServerlessDeployment && !isFlexDeployment:
 		tagsSpec = atlasDeployment.Spec.ServerlessSpec.Tags
 		err = serverlessDeployment(atlasDeployment.Spec.ServerlessSpec)
+	case !isRegularDeployment && !isServerlessDeployment && isFlexDeployment:
+		tagsSpec = atlasDeployment.Spec.FlexSpec.Tags
+		err = flexDeployment(atlasDeployment.Spec.FlexSpec)
 	default:
-		tagsSpec = atlasDeployment.Spec.DeploymentSpec.Tags
-		err = regularDeployment(atlasDeployment.Spec.DeploymentSpec, isGov, regionUsageRestrictions)
+		return errors.New("expected exactly one of spec.deploymentSpec or spec.serverlessSpec or spec.flexSpec to be present, but none were")
 	}
 
 	if err != nil {
@@ -265,3 +269,8 @@ func serverlessPrivateEndpoints(privateEndpoints []akov2.ServerlessPrivateEndpoi
 
 	return nil
 }
+
+func flexDeployment(spec *akov2.FlexSpec) error {
+	// TODO
+	return nil
+}