change keepDevDB flag to disposeDevDB

charts/atlas-operator/templates/deployment.yaml

@@ -46,8 +46,8 @@ spec:
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 12 }}
         env:
-        {{- if .Values.keepDevDB }}
-        - name: KEEP_DEVDB
+        {{- if .Values.disposeDevDB }}
+        - name: DISPOSE_DEVDB
           value: "true"
         {{- end }}
       {{- with .Values.imagePullSecrets }}

charts/atlas-operator/values.yaml

@@ -41,6 +41,6 @@ tolerations: []
 
 affinity: {}
 
-# By default, the operator will remove devdb pods after migration is complete.
+# By default, the operator will recreate devdb pods after migration
 # Set this to true to keep the devdb pods around.
-keepDevDB: false
+disposeDevDB: false

controllers/atlasschema_controller.go

@@ -58,7 +58,7 @@ type (
 		configMapWatcher *watch.ResourceWatcher
 		secretWatcher    *watch.ResourceWatcher
 		recorder         record.EventRecorder
-		keepDevDB        bool
+		disposeDevDB     bool
 	}
 	// managedData contains information about the managed database and its desired state.
 	managedData struct {
@@ -74,15 +74,15 @@ type (
 	}
 )
 
-func NewAtlasSchemaReconciler(mgr Manager, execPath string, keepDevDB bool) *AtlasSchemaReconciler {
+func NewAtlasSchemaReconciler(mgr Manager, execPath string, disposeDevDB bool) *AtlasSchemaReconciler {
 	return &AtlasSchemaReconciler{
 		Client:           mgr.GetClient(),
 		scheme:           mgr.GetScheme(),
 		execPath:         execPath,
 		configMapWatcher: watch.New(),
 		secretWatcher:    watch.New(),
 		recorder:         mgr.GetEventRecorderFor("atlasschema-controller"),
-		keepDevDB:        keepDevDB,
+		disposeDevDB:     disposeDevDB,
 	}
 }
 

controllers/atlasschema_controller_test.go

@@ -110,7 +110,9 @@ func TestReconcile_Reconcile(t *testing.T) {
 		ObjectMeta: meta,
 		Spec:       dbv1alpha1.AtlasSchemaSpec{},
 	}
-	h, reconcile := newRunner(newAtlasSchemaReconcilerWrapper(true), func(cb *fake.ClientBuilder) {
+	h, reconcile := newRunner(func(mgr Manager, name string) reconcile.Reconciler {
+		return NewAtlasSchemaReconciler(mgr, name, false)
+	}, func(cb *fake.ClientBuilder) {
 		cb.WithObjects(obj)
 	})
 	assert := func(except ctrl.Result, ready bool, reason, msg string) {
@@ -702,9 +704,3 @@ func events(r record.EventRecorder) []string {
 		}
 	}
 }
-
-func newAtlasSchemaReconcilerWrapper(keepDevDB bool) func(Manager, string) reconcile.Reconciler {
-	return func(mgr Manager, name string) reconcile.Reconciler {
-		return NewAtlasSchemaReconciler(mgr, name, keepDevDB)
-	}
-}

controllers/devdb.go

@@ -46,9 +46,21 @@ const (
 
 // cleanUp clean up any resources created by the controller
 func (r *AtlasSchemaReconciler) cleanUp(ctx context.Context, sc *dbv1alpha1.AtlasSchema) {
-	// If keepDevDB is true, delete pods to clean up
-	// Otherwise, scale down the deployment to 0
-	if r.keepDevDB {
+	// If disposeDevDB is true, scale down the deployment to 0
+	// Otherwise, delete pods to clean up
+	if r.disposeDevDB {
+		deploy := &appsv1.Deployment{}
+		key := nameDevDB(sc.ObjectMeta)
+		err := r.Get(ctx, key, deploy)
+		if err != nil {
+			r.recorder.Eventf(sc, corev1.EventTypeWarning, "CleanUpDevDB", "Error getting devDB deployment: %v", err)
+			return
+		}
+		deploy.Spec.Replicas = new(int32)
+		if err := r.Update(ctx, deploy); err != nil {
+			r.recorder.Eventf(sc, corev1.EventTypeWarning, "CleanUpDevDB", "Error scaling down devDB deployment: %v", err)
+		}
+	} else {
 		pods := &corev1.PodList{}
 		err := r.List(ctx, pods, client.MatchingLabels(map[string]string{
 			labelInstance: nameDevDB(sc.ObjectMeta).Name,
@@ -62,18 +74,6 @@ func (r *AtlasSchemaReconciler) cleanUp(ctx context.Context, sc *dbv1alpha1.Atla
 				r.recorder.Eventf(sc, corev1.EventTypeWarning, "CleanUpDevDB", "Error deleting devDB pod %s: %v", p.Name, err)
 			}
 		}
-	} else {
-		deploy := &appsv1.Deployment{}
-		key := nameDevDB(sc.ObjectMeta)
-		err := r.Get(ctx, key, deploy)
-		if err != nil {
-			r.recorder.Eventf(sc, corev1.EventTypeWarning, "CleanUpDevDB", "Error getting devDB deployment: %v", err)
-			return
-		}
-		deploy.Spec.Replicas = new(int32)
-		if err := r.Update(ctx, deploy); err != nil {
-			r.recorder.Eventf(sc, corev1.EventTypeWarning, "CleanUpDevDB", "Error scaling down devDB deployment: %v", err)
-		}
 	}
 
 }

main.go

@@ -54,8 +54,8 @@ const (
 	envNoUpdate = "SKIP_VERCHECK"
 	vercheckURL = "https://vercheck.ariga.io"
 	execPath    = "/atlas"
-	// keepDevDB when enabled it keeps the devdb running after migration
-	keepDevDB = "KEEP_DEVDB"
+	// disposeDevDB when enabled it deletes the devDB pods after the schema is created
+	disposeDevDB = "DISPOSE_DEVDB"
 )
 
 func init() {
@@ -94,8 +94,8 @@ func main() {
 		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
-	keepDevDB := getKeepDevDBEnv()
-	if err = controllers.NewAtlasSchemaReconciler(mgr, execPath, keepDevDB).
+	disposeDevDB := getDisposeDevDBEnv()
+	if err = controllers.NewAtlasSchemaReconciler(mgr, execPath, disposeDevDB).
 		SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AtlasSchema")
 		os.Exit(1)
@@ -159,16 +159,16 @@ func checkForUpdate() {
 	}
 }
 
-// getKeepDevDBEnv returns the value of the env var KEEP_DEVDB.
-func getKeepDevDBEnv() bool {
-	env := os.Getenv(keepDevDB)
+// getDisposeDevDBEnv returns the value of the env var DISPOSE_DEVDB.
+func getDisposeDevDBEnv() bool {
+	env := os.Getenv(disposeDevDB)
 	if env == "" {
 		return false
 	}
-	keepDevDB, err := strconv.ParseBool(env)
+	disposeDevDB, err := strconv.ParseBool(env)
 	if err != nil {
-		setupLog.Error(err, "invalid value for env var KEEP_DEVDB, expected true or false")
+		setupLog.Error(err, "invalid value for env var DISPOSE_DEVDB, expected true or false")
 		os.Exit(1)
 	}
-	return keepDevDB
+	return disposeDevDB
 }