atlasmigration: allow config for dev_db

ariga · Apr 11, 2024 · 0235a64 · 0235a64
1 parent 62744a8
commit 0235a64
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 1 deletion.
diff --git a/api/v1alpha1/atlasmigration_types.go b/api/v1alpha1/atlasmigration_types.go
@@ -66,6 +66,13 @@ type (
 		Cloud Cloud `json:"cloud,omitempty"`
 		// Dir defines the directory to use for migrations as a configmap key reference.
 		Dir Dir `json:"dir"`
+		// DevURL is the URL of the database to use for normalization and calculations.
+		// If not specified, the operator will spin up a temporary database container to use for these operations.
+		// +optional
+		DevURL string `json:"devURL"`
+		// DevURLFrom is a reference to a secret containing the URL of the database to use for normalization and calculations.
+		// +optional
+		DevURLFrom Secret `json:"devURLFrom,omitempty"`
 		// RevisionsSchema defines the schema that revisions table resides in
 		RevisionsSchema string `json:"revisionsSchema,omitempty"`
 		// BaselineVersion defines the baseline version of the database on the first migration.

diff --git a/api/v1alpha1/atlasschema_types.go b/api/v1alpha1/atlasschema_types.go
@@ -65,9 +65,9 @@ type (
 		TargetSpec `json:",inline"`
 		// Desired Schema of the target.
 		Schema Schema `json:"schema,omitempty"`
-		// +optional
 		// DevURL is the URL of the database to use for normalization and calculations.
 		// If not specified, the operator will spin up a temporary database container to use for these operations.
+		// +optional
 		DevURL string `json:"devURL"`
 		// DevURLFrom is a reference to a secret containing the URL of the database to use for normalization and calculations.
 		// +optional

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/atlas-operator/templates/crds/crd.yaml b/charts/atlas-operator/templates/crds/crd.yaml
@@ -184,6 +184,38 @@ spec:
                         x-kubernetes-map-type: atomic
                     type: object
                 type: object
+              devURL:
+                description: |-
+                  DevURL is the URL of the database to use for normalization and calculations.
+                  If not specified, the operator will spin up a temporary database container to use for these operations.
+                type: string
+              devURLFrom:
+                description: DevURLFrom is a reference to a secret containing the
+                  URL of the database to use for normalization and calculations.
+                properties:
+                  secretKeyRef:
+                    description: SecretKeyRef defines the secret key reference to
+                      use for the user.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                type: object
               dir:
                 description: Dir defines the directory to use for migrations as a
                   configmap key reference.

diff --git a/config/crd/bases/db.atlasgo.io_atlasmigrations.yaml b/config/crd/bases/db.atlasgo.io_atlasmigrations.yaml
@@ -199,6 +199,38 @@ spec:
                         x-kubernetes-map-type: atomic
                     type: object
                 type: object
+              devURL:
+                description: |-
+                  DevURL is the URL of the database to use for normalization and calculations.
+                  If not specified, the operator will spin up a temporary database container to use for these operations.
+                type: string
+              devURLFrom:
+                description: DevURLFrom is a reference to a secret containing the
+                  URL of the database to use for normalization and calculations.
+                properties:
+                  secretKeyRef:
+                    description: SecretKeyRef defines the secret key reference to
+                      use for the user.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                type: object
               dir:
                 description: Dir defines the directory to use for migrations as a
                   configmap key reference.

diff --git a/controllers/atlasmigration_controller.go b/controllers/atlasmigration_controller.go
@@ -345,6 +345,7 @@ func (r *AtlasMigrationReconciler) extractData(ctx context.Context, res *dbv1alp
 		s    = res.Spec
 		data = &migrationData{
 			EnvName:         defaultEnvName,
+			DevURL:          s.DevURL,
 			RevisionsSchema: s.RevisionsSchema,
 			Baseline:        s.Baseline,
 			ExecOrder:       string(s.ExecOrder),
@@ -386,6 +387,14 @@ func (r *AtlasMigrationReconciler) extractData(ctx context.Context, res *dbv1alp
 	default:
 		return nil, errors.New("no directory specified")
 	}
+	if s := s.DevURLFrom.SecretKeyRef; s != nil {
+		// SecretKeyRef is set, get the secret value
+		// then override the dev url.
+		data.DevURL, err = getSecretValue(ctx, r, res.Namespace, s)
+		if err != nil {
+			return nil, err
+		}
+	}
 	return data, nil
 }