Merge pull request #103 from formancehq/feat/pla-224-featjobs-ability…

…-to-disable-jobs feat(membership): ability to disable migration job
formancehq · Feb 4, 2025 · 04246be · 04246be
2 parents 6e36c9b + 0aa76a2
commit 04246be
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -5,12 +5,12 @@
 | Readme | Chart Version | App Version | Description | Hub |
 |--------|---------------|-------------|-------------|-----|
 | [Agent](./charts/agent/README.md) | 2.4.0 | v2.2.0 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
-| [Cloudprem](./charts/cloudprem/README.md) | 3.0.0-rc.6 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
+| [Cloudprem](./charts/cloudprem/README.md) | 3.0.0-rc.7 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
 | [Console](./charts/console/README.md) | 2.0.0 | console-on.v1.0.2 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
 | [Console-V3](./charts/console-v3/README.md) | 2.0.1 | 9bc0913c2e5eecf5713a68312e43e7a80b4c61e5 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console-v3)](https://artifacthub.io/packages/search?repo=console-v3) |
 | [Core](./charts/core/README.md) | 1.1.0 | latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
 | [Demo](./charts/demo/README.md) | 2.1.0 | latest | Formance Private Regions Demo | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/demo)](https://artifacthub.io/packages/search?repo=demo) |
-| [Membership](./charts/membership/README.md) | 2.1.2 | v1.1.0 | Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
+| [Membership](./charts/membership/README.md) | 2.2.0 | v1.1.0 | Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
 | [Portal](./charts/portal/README.md) | 2.0.2 | 9bc0913c2e5eecf5713a68312e43e7a80b4c61e5 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
 | [Regions](./charts/regions/README.md) | 2.8.2 | latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
 | [Stargate](./charts/stargate/README.md) | 0.6.0 | latest | Formance Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |

diff --git a/charts/cloudprem/Chart.lock b/charts/cloudprem/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: membership
   repository: file://../membership
-  version: 2.1.2
+  version: 2.2.0
 - name: portal
   repository: file://../portal
   version: 2.0.2
@@ -11,5 +11,5 @@ dependencies:
 - name: console-v3
   repository: file://../console-v3
   version: 2.0.1
-digest: sha256:98987752f3a05efc34c2b0f64bf0618013b78fb3c18ab3fb800ad22c54e85b9e
-generated: "2025-02-03T18:05:12.547361+01:00"
+digest: sha256:1a644f4efbed33a6aa3e29d378e506498a5f901b7a0d049b165ac39cb1acf2f2
+generated: "2025-02-04T09:34:56.007027+01:00"
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
@@ -32,7 +32,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0-rc.6
+version: 3.0.0-rc.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
@@ -1,5 +1,5 @@
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem)
-![Version: 3.0.0-rc.6](https://img.shields.io/badge/Version-3.0.0--rc.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
+![Version: 3.0.0-rc.7](https://img.shields.io/badge/Version-3.0.0--rc.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
 
 # Formance Cloudprem Helm Chart
 
@@ -431,6 +431,7 @@ Dex:
 | console-v3.config.cookie.existingSecret | string | `""` | is the name of the secret |
 | console-v3.config.cookie.name | string | `""` | is the name of the cookie. It is intended to be unique when having multiple console-v3 instances. |
 | console-v3.config.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
+| membership.config.migration.enabled | bool | `true` | Enable migration job |
 | membership.config.migration.postgresql.auth.existingSecret | string | `""` | Name of existing secret to use for PostgreSQL credentials (overrides `auth.existingSecret`). |
 | membership.config.migration.postgresql.auth.password | string | `""` | Password for the "postgres" admin user (overrides `auth.postgresPassword`) |
 | membership.config.migration.postgresql.auth.secretKeys.adminPasswordKey | string | `""` | Name of key in existing secret to use for PostgreSQL credentials (overrides `auth.secretKeys.adminPasswordKey`). Only used when `global.postgresql.auth.existingSecret` is set. |

diff --git a/charts/membership/Chart.yaml b/charts/membership/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.2
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/membership/README.md b/charts/membership/README.md
@@ -1,6 +1,6 @@
 # membership
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
 
 Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions.
 
@@ -75,6 +75,7 @@ Kubernetes: `>=1.14.0-0`
 | global.postgresql.host | string | `""` | Host for PostgreSQL (overrides included postgreql `host`) |
 | global.postgresql.service.ports.postgresql | int | `5432` | PostgreSQL service port (overrides `service.ports.postgresql`) |
 | global.serviceHost | string | `""` | is the base domain for portal and console |
+| config.migration.enabled | bool | `true` | Enable migration job |
 | config.migration.postgresql.auth.existingSecret | string | `""` | Name of existing secret to use for PostgreSQL credentials (overrides `auth.existingSecret`). |
 | config.migration.postgresql.auth.password | string | `""` | Password for the "postgres" admin user (overrides `auth.postgresPassword`) |
 | config.migration.postgresql.auth.secretKeys.adminPasswordKey | string | `""` | Name of key in existing secret to use for PostgreSQL credentials (overrides `auth.secretKeys.adminPasswordKey`). Only used when `global.postgresql.auth.existingSecret` is set. |

diff --git a/charts/membership/templates/job.yaml b/charts/membership/templates/job.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.config.migration.enabled -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -72,4 +73,5 @@ spec:
       {{- with .Values.config.migration.volumes}}
       volumes:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
+{{- end -}}
diff --git a/charts/membership/values.schema.json b/charts/membership/values.schema.json
@@ -239,6 +239,9 @@
                             "properties": {},
                             "type": "object"
                         },
+                        "enabled": {
+                            "type": "boolean"
+                        },
                         "postgresql": {
                             "properties": {
                                 "auth": {

diff --git a/charts/membership/values.yaml b/charts/membership/values.yaml
@@ -504,6 +504,9 @@ config:
       volumeMounts: []
 
   migration:
+    # -- Enable migration job
+    # @section -- Global configuration
+    enabled: true
     postgresql:
       auth:
         # -- Name for a custom user to create (overrides `auth.username`)