fix: tests (#404)

formancehq · Jun 30, 2023 · 4bd9696 · 4bd9696 · vercel · Jun 30, 2023
1 parent cf0a6e5
commit 4bd9696
Show file tree

Hide file tree

Showing 78 changed files with 403 additions and 278 deletions.
diff --git a/components/operator/internal/controllers/stack/stack_reconciler_test.go b/components/operator/internal/controllers/stack/stack_reconciler_test.go
@@ -54,9 +54,7 @@ var _ = Describe("Check stack deployment", func() {
 		if !dirEntry.IsDir() {
 			continue
 		}
-		if dirEntry.Name() != "multipod-latest" {
-			continue
-		}
+
 		name := strings.ReplaceAll(dirEntry.Name(), ".", "-")
 		dirName := dirEntry.Name()
 

diff --git a/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml b/...trollers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml
@@ -434,6 +434,11 @@ data:
                               "match": {
                                 "indexed.provider": this.payload.connector
                               }
+                            },
+                            {
+                              "match": {
+                                "stack": env("STACK")
+                              }
                             }
                           ]
                         }

diff --git a/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml b/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml
@@ -921,59 +921,6 @@ spec:
                   terminationMessagePath: /dev/termination-log
                   terminationMessagePolicy: File
             dnsPolicy: ClusterFirst
-            initContainers:
-                - command:
-                    - payments
-                    - migrate
-                  env:
-                    - name: POSTGRES_HOST
-                      value: localhost
-                    - name: POSTGRES_PORT
-                      value: "5432"
-                    - name: POSTGRES_DATABASE
-                      value: monopod-latest-payments
-                    - name: POSTGRES_USERNAME
-                      value: root
-                    - name: POSTGRES_PASSWORD
-                      value: root
-                    - name: POSTGRES_NO_DATABASE_URI
-                      value: postgresql://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)
-                    - name: POSTGRES_URI
-                      value: $(POSTGRES_NO_DATABASE_URI)/$(POSTGRES_DATABASE)?sslmode=disable
-                    - name: LISTEN
-                      value: :10003
-                    - name: OTEL_TRACES
-                      value: "true"
-                    - name: OTEL_TRACES_EXPORTER
-                      value: otlp
-                    - name: OTEL_TRACES_EXPORTER_OTLP_INSECURE
-                      value: "true"
-                    - name: OTEL_TRACES_EXPORTER_OTLP_MODE
-                      value: grpc
-                    - name: OTEL_TRACES_PORT
-                      value: "4317"
-                    - name: OTEL_TRACES_ENDPOINT
-                      value: localhost
-                    - name: OTEL_TRACES_EXPORTER_OTLP_ENDPOINT
-                      value: $(OTEL_TRACES_ENDPOINT):$(OTEL_TRACES_PORT)
-                    - name: OTEL_RESOURCE_ATTRIBUTES
-                    - name: BROKER
-                      value: kafka
-                    - name: PUBLISHER_KAFKA_ENABLED
-                      value: "true"
-                    - name: PUBLISHER_KAFKA_BROKER
-                      value: kafka:1234
-                    - name: POSTGRES_DATABASE_NAME
-                      value: $(POSTGRES_DATABASE)
-                    - name: CONFIG_ENCRYPTION_KEY
-                    - name: PUBLISHER_TOPIC_MAPPING
-                      value: '*:monopod-latest-payments'
-                  image: ghcr.io/formancehq/payments:latest
-                  imagePullPolicy: Always
-                  name: migrate
-                  resources: {}
-                  terminationMessagePath: /dev/termination-log
-                  terminationMessagePolicy: File
             restartPolicy: Always
             schedulerName: default-scheduler
             securityContext: {}
@@ -1003,4 +950,10 @@ spec:
                     defaultMode: 420
                     name: search-benthos-templates
                   name: search-benthos-templates
-status: {}
+status:
+    conditions:
+        - lastTransitionTime: "2023-06-30T15:11:03Z"
+          lastUpdateTime: "2023-06-30T15:11:03Z"
+          status: "True"
+          type: Available
+    observedGeneration: 1
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
@@ -0,0 +1,18 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Migration
+metadata:
+    annotations:
+        reloader.stakater.com/auto: "true"
+    generation: 1
+    labels:
+        stack: "true"
+    name: payments-v0.6.5-post-upgrade
+    namespace: monopod-latest
+spec:
+    configuration: monopod-latest
+    module: payments
+    postUpgrade: true
+    targetedVersion: v0.6.5
+    version: monopod-latest
+status:
+    terminated: true
diff --git a/...pod-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-pre-upgrade.yaml b/...pod-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.5-pre-upgrade.yaml
@@ -0,0 +1,18 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Migration
+metadata:
+    annotations:
+        reloader.stakater.com/auto: "true"
+    generation: 1
+    labels:
+        stack: "true"
+    name: payments-v0.6.5-pre-upgrade
+    namespace: monopod-latest
+spec:
+    configuration: monopod-latest
+    module: payments
+    postUpgrade: false
+    targetedVersion: v0.6.5
+    version: monopod-latest
+status:
+    terminated: true
diff --git a/...pod-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.7-pre-upgrade.yaml b/...pod-latest/results/migrations-stack.formance.com-v1beta3/payments-v0.6.7-pre-upgrade.yaml
@@ -0,0 +1,18 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Migration
+metadata:
+    annotations:
+        reloader.stakater.com/auto: "true"
+    generation: 1
+    labels:
+        stack: "true"
+    name: payments-v0.6.7-pre-upgrade
+    namespace: monopod-latest
+spec:
+    configuration: monopod-latest
+    module: payments
+    postUpgrade: false
+    targetedVersion: v0.6.7
+    version: monopod-latest
+status:
+    terminated: true
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
@@ -0,0 +1,18 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Migration
+metadata:
+    annotations:
+        reloader.stakater.com/auto: "true"
+    generation: 1
+    labels:
+        stack: "true"
+    name: search-v0.7.0-post-upgrade
+    namespace: monopod-latest
+spec:
+    configuration: monopod-latest
+    module: search
+    postUpgrade: true
+    targetedVersion: v0.7.0
+    version: monopod-latest
+status:
+    terminated: true
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
@@ -0,0 +1,18 @@
+apiVersion: stack.formance.com/v1beta3
+kind: Migration
+metadata:
+    annotations:
+        reloader.stakater.com/auto: "true"
+    generation: 1
+    labels:
+        stack: "true"
+    name: wallets-v0.4.3-post-upgrade
+    namespace: monopod-latest
+spec:
+    configuration: monopod-latest
+    module: wallets
+    postUpgrade: true
+    targetedVersion: v0.4.3
+    version: monopod-latest
+status:
+    terminated: true
diff --git a/...perator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/auth.yaml b/...perator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/auth.yaml
@@ -6,9 +6,9 @@ metadata:
     name: auth
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.140
+    clusterIP: 10.0.0.167
     clusterIPs:
-        - 10.0.0.140
+        - 10.0.0.167
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/control.yaml b/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/control.yaml
@@ -6,9 +6,9 @@ metadata:
     name: control
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.163
+    clusterIP: 10.0.0.245
     clusterIPs:
-        - 10.0.0.163
+        - 10.0.0.245
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/gateway.yaml b/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/gateway.yaml
@@ -6,9 +6,9 @@ metadata:
     name: gateway
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.50
+    clusterIP: 10.0.0.237
     clusterIPs:
-        - 10.0.0.50
+        - 10.0.0.237
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...rator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/ledger.yaml b/...rator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/ledger.yaml
@@ -6,9 +6,9 @@ metadata:
     name: ledger
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.20
+    clusterIP: 10.0.0.163
     clusterIPs:
-        - 10.0.0.20
+        - 10.0.0.163
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...nternal/controllers/stack/testdata/monopod-latest/results/services--v1/orchestration.yaml b/...nternal/controllers/stack/testdata/monopod-latest/results/services--v1/orchestration.yaml
@@ -6,9 +6,9 @@ metadata:
     name: orchestration
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.103
+    clusterIP: 10.0.0.159
     clusterIPs:
-        - 10.0.0.103
+        - 10.0.0.159
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/payments.yaml b/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/payments.yaml
@@ -6,9 +6,9 @@ metadata:
     name: payments
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.164
+    clusterIP: 10.0.0.235
     clusterIPs:
-        - 10.0.0.164
+        - 10.0.0.235
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...ternal/controllers/stack/testdata/monopod-latest/results/services--v1/search-benthos.yaml b/...ternal/controllers/stack/testdata/monopod-latest/results/services--v1/search-benthos.yaml
@@ -6,9 +6,9 @@ metadata:
     name: search-benthos
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.149
+    clusterIP: 10.0.0.180
     clusterIPs:
-        - 10.0.0.149
+        - 10.0.0.180
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...rator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/search.yaml b/...rator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/search.yaml
@@ -6,9 +6,9 @@ metadata:
     name: search
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.133
+    clusterIP: 10.0.0.184
     clusterIPs:
-        - 10.0.0.133
+        - 10.0.0.184
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/stargate.yaml b/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/stargate.yaml
@@ -6,9 +6,9 @@ metadata:
     name: stargate
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.249
+    clusterIP: 10.0.0.229
     clusterIPs:
-        - 10.0.0.249
+        - 10.0.0.229
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/wallets.yaml b/...ator/internal/controllers/stack/testdata/monopod-latest/results/services--v1/wallets.yaml
@@ -6,9 +6,9 @@ metadata:
     name: wallets
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.81
+    clusterIP: 10.0.0.102
     clusterIPs:
-        - 10.0.0.81
+        - 10.0.0.102
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/webhooks.yaml b/...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/webhooks.yaml
@@ -6,9 +6,9 @@ metadata:
     name: webhooks
     namespace: monopod-latest
 spec:
-    clusterIP: 10.0.0.219
+    clusterIP: 10.0.0.121
     clusterIPs:
-        - 10.0.0.219
+        - 10.0.0.121
     internalTrafficPolicy: Cluster
     ipFamilies:
         - IPv4

diff --git a/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml b/...ollers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml
@@ -434,6 +434,11 @@ data:
                               "match": {
                                 "indexed.provider": this.payload.connector
                               }
+                            },
+                            {
+                              "match": {
+                                "stack": env("STACK")
+                              }
                             }
                           ]
                         }