CLOUDP-175080: Support deletion protection for Atlas projects (#1028)

mongodb · Aug 2, 2023 · 5f99ca2 · 5f99ca2
1 parent 0d903e7
commit 5f99ca2
Show file tree

Hide file tree

Showing 12 changed files with 325 additions and 134 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -147,14 +147,16 @@ func main() {
 	}
 
 	if err = (&atlasproject.AtlasProjectReconciler{
-		Client:           mgr.GetClient(),
-		Log:              logger.Named("controllers").Named("AtlasProject").Sugar(),
-		Scheme:           mgr.GetScheme(),
-		AtlasDomain:      config.AtlasDomain,
-		ResourceWatcher:  watch.NewResourceWatcher(),
-		GlobalAPISecret:  config.GlobalAPISecret,
-		GlobalPredicates: globalPredicates,
-		EventRecorder:    mgr.GetEventRecorderFor("AtlasProject"),
+		Client:                      mgr.GetClient(),
+		Log:                         logger.Named("controllers").Named("AtlasProject").Sugar(),
+		Scheme:                      mgr.GetScheme(),
+		AtlasDomain:                 config.AtlasDomain,
+		ResourceWatcher:             watch.NewResourceWatcher(),
+		GlobalAPISecret:             config.GlobalAPISecret,
+		GlobalPredicates:            globalPredicates,
+		EventRecorder:               mgr.GetEventRecorderFor("AtlasProject"),
+		ObjectDeletionProtection:    config.ObjectDeletionProtection,
+		SubObjectDeletionProtection: config.SubObjectDeletionProtection,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AtlasProject")
 		os.Exit(1)

diff --git a/helm-charts b/helm-charts
diff --git a/pkg/api/v1/atlasproject_types.go b/pkg/api/v1/atlasproject_types.go
@@ -226,8 +226,8 @@ func (p *AtlasProject) WithLabels(labels map[string]string) *AtlasProject {
 	return p
 }
 
-func (p *AtlasProject) WithAnnotations(labels map[string]string) *AtlasProject {
-	p.Labels = labels
+func (p *AtlasProject) WithAnnotations(annotations map[string]string) *AtlasProject {
+	p.Annotations = annotations
 	return p
 }
 

diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go b/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go
@@ -131,7 +131,7 @@ func (r *AtlasDatabaseUserReconciler) Reconcile(ctx context.Context, req ctrl.Re
 	}
 	workflowCtx.Client = atlasClient
 
-	owner, err := customresource.IsOwner(databaseUser, r.ObjectDeletionProtection, managedByOperator(), managedByAtlas(ctx, atlasClient, project.ID(), log))
+	owner, err := customresource.IsOwner(databaseUser, r.ObjectDeletionProtection, customresource.IsResourceManagedByOperator, managedByAtlas(ctx, atlasClient, project.ID(), log))
 	if err != nil {
 		result = workflow.Terminate(workflow.Internal, fmt.Sprintf("enable to resolve ownership for deletion protection: %s", err))
 		workflowCtx.SetConditionFromResult(status.DatabaseUserReadyType, result)
@@ -274,16 +274,3 @@ func managedByAtlas(ctx context.Context, atlasClient mongodbatlas.Client, projec
 		return !isSame, nil
 	}
 }
-
-func managedByOperator() customresource.OperatorChecker {
-	return func(resource mdbv1.AtlasCustomResource) (bool, error) {
-		annotations := resource.GetAnnotations()
-		if annotations == nil {
-			return false, nil
-		}
-
-		_, ok := annotations[customresource.AnnotationLastAppliedConfiguration]
-
-		return ok, nil
-	}
-}