fix(operator): sorted versions and payments migration (#841)

formancehq · Nov 10, 2023 · 94d1617 · 94d1617 · vercel · Nov 10, 2023
1 parent e3e4d9a
commit 94d1617
Show file tree

Hide file tree

Showing 181 changed files with 5,809 additions and 39 deletions.
diff --git a/components/operator/apis/stack/v1beta3/migration_types.go b/components/operator/apis/stack/v1beta3/migration_types.go
@@ -23,6 +23,7 @@ import (
 // MigrationSpec defines the desired state of Migration
 type MigrationSpec struct {
 	Configuration   string `json:"configuration"`
+	CurrentVersion  string `json:"currentVersion"`
 	Version         string `json:"version"`
 	Module          string `json:"module"`
 	TargetedVersion string `json:"targetedVersion"`

diff --git a/components/operator/internal/controllers/stack/migration_reconciler.go b/components/operator/internal/controllers/stack/migration_reconciler.go
@@ -105,7 +105,7 @@ func (r *MigrationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		Platform:      r.platform,
 	}
 
-	var fn func(ctx context.Context, jobRunner modules.JobRunner, config modules.ReconciliationConfig) (bool, error)
+	var fn func(ctx context.Context, jobRunner modules.JobRunner, config modules.MigrationConfig) (bool, error)
 
 	if migration.Spec.PostUpgrade {
 		fn = version.PostUpgrade
@@ -116,8 +116,13 @@ func (r *MigrationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	jobRunner := modules.NewJobRunner(r.Client, r.Scheme, stack, migration, fmt.Sprintf("%s-%s-%s-upgrade-",
 		module.Name(), migration.Spec.TargetedVersion, migration.Discriminator()))
 
+	migrationConfig := modules.MigrationConfig{
+		ReconciliationConfig: rc,
+		Version:              migration.Spec.CurrentVersion,
+	}
+
 	var returnedError error
-	if terminated, err := fn(ctx, jobRunner, rc); err != nil {
+	if terminated, err := fn(ctx, jobRunner, migrationConfig); err != nil {
 		returnedError = err
 		migration.Status.Err = returnedError.Error()
 	} else {

diff --git a/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml b/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.6.5

diff --git a/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml b/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml b/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.0

diff --git a/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml b/...e-service/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.1

diff --git a/...-one-service/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml b/...-one-service/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.0.0

diff --git a/...one-service/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml b/...one-service/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: ""
     module: search
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...-one-service/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml b/...-one-service/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.7.0

diff --git a/...ne-service/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml b/...ne-service/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.3

diff --git a/...ne-service/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml b/...ne-service/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-disabled-one-service
 spec:
     configuration: monopod-disabled-one-service
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.4

diff --git a/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml b/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.6.5

diff --git a/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml b/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml b/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.0

diff --git a/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml b/...od-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: latest
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.1

diff --git a/...nopod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml b/...nopod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.0.0

diff --git a/...opod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml b/...opod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: ""
     module: search
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...nopod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml b/...nopod-latest/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.7.0

diff --git a/...pod-latest/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml b/...pod-latest/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.3

diff --git a/...pod-latest/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml b/...pod-latest/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-latest
 spec:
     configuration: monopod-latest
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.4

diff --git a/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml b/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: payments
     postUpgrade: true
     targetedVersion: v0.6.5

diff --git a/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml b/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: payments
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml b/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.8.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.0

diff --git a/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml b/...-ledgerv1/results/migrations-stack.formance.com-v1beta3/payments-v0.8.1-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: payments
     postUpgrade: true
     targetedVersion: v0.8.1

diff --git a/...pod-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml b/...pod-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.0.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.0.0

diff --git a/...od-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml b/...od-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: search
     postUpgrade: true
     targetedVersion: v0.7.0

diff --git a/...pod-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml b/...pod-ledgerv1/results/migrations-stack.formance.com-v1beta3/search-v0.7.0-pre-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: search
     postUpgrade: false
     targetedVersion: v0.7.0

diff --git a/...d-ledgerv1/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml b/...d-ledgerv1/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.3-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.3

diff --git a/...d-ledgerv1/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml b/...d-ledgerv1/results/migrations-stack.formance.com-v1beta3/wallets-v0.4.4-post-upgrade.yaml
@@ -8,6 +8,7 @@ metadata:
     namespace: monopod-ledgerv1
 spec:
     configuration: monopod-ledgerv1
+    currentVersion: ""
     module: wallets
     postUpgrade: true
     targetedVersion: v0.4.4

diff --git a/...ernal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/configuration.yaml b/...ernal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/configuration.yaml
@@ -0,0 +1,72 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Configuration
+metadata:
+  name: default
+spec:
+  light: true
+  broker:
+    kafka:
+      brokers:
+      - kafka:1234
+  monitoring:
+    traces:
+      otlp:
+        endpoint: localhost
+        insecure: true
+        mode: grpc
+        port: 4317
+  services:
+    auth:
+      postgres:
+        disableSSLMode: true
+        host: localhost
+        password: root
+        port: 5432
+        username: root
+    control: {}
+    ledger:
+      postgres:
+        disableSSLMode: true
+        host: localhost
+        password: root
+        port: 5432
+        username: root
+    orchestration:
+      postgres:
+        disableSSLMode: true
+        host: localhost
+        password: root
+        port: 5432
+        username: root
+    payments:
+      encryptionKey:
+      postgres:
+        disableSSLMode: true
+        host: localhost
+        password: root
+        port: 5432
+        username: root
+    search:
+      batching:
+        count:
+        period:
+      elasticSearch:
+        host: elasticsearch
+        pathPrefix: ''
+        port: 9200
+        scheme: http
+    stargate:
+    wallets:
+    webhooks:
+      postgres:
+        disableSSLMode: true
+        host: localhost
+        password: root
+        port: 5432
+        username: root
+  temporal:
+    address:
+    namespace:
+    tls:
+      crt:
+      key:
diff --git a/...ck/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/auth-config.yaml b/...ck/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/auth-config.yaml
@@ -0,0 +1,42 @@
+apiVersion: v1
+data:
+    config.yaml: |
+        clients:
+            - public: false
+              description: null
+              redirectUris:
+                - http://example.net/auth/login
+              PostLogoutRedirectUris:
+                - http://example.net/auth/destroy
+              scopes:
+                - openid
+                - profile
+                - email
+                - offline
+              id: control
+              secrets:
+                - mocked-secret
+            - public: false
+              description: null
+              redirectUris: []
+              PostLogoutRedirectUris: []
+              scopes:
+                - openid
+              id: orchestration
+              secrets:
+                - mocked-secret
+            - public: false
+              description: null
+              redirectUris: []
+              PostLogoutRedirectUris: []
+              scopes:
+                - openid
+              id: wallets
+              secrets:
+                - mocked-secret
+kind: ConfigMap
+metadata:
+    labels:
+        stack: "true"
+    name: auth-config
+    namespace: monopod-payments-after-v1-0-0-alpha-6