From ae657002e9378ce1c6cdfabba4e074664cab5d62 Mon Sep 17 00:00:00 2001
From: David Ragot <35502263+Dav-14@users.noreply.github.com>
Date: Tue, 22 Oct 2024 10:58:55 +0200
Subject: [PATCH] feat: portal, console imagePullSecrets (#59)

---
 README.md                                     |  6 ++--
 charts/cloudprem/Chart.lock                   |  8 ++---
 charts/cloudprem/Chart.yaml                   |  6 ++--
 charts/cloudprem/README.md                    |  4 ++-
 .../profiles/11-membership-multi-user.yaml    | 32 +++++++++++++++++++
 charts/console/Chart.yaml                     |  2 +-
 charts/console/README.md                      |  3 +-
 charts/console/templates/deployment.yaml      |  4 +++
 charts/console/values.schema.json             |  3 ++
 charts/console/values.yaml                    |  3 ++
 charts/membership/values.yaml                 |  1 +
 charts/portal/Chart.yaml                      |  2 +-
 charts/portal/README.md                       |  3 +-
 charts/portal/templates/deployment.yaml       |  4 +++
 charts/portal/values.schema.json              |  3 ++
 charts/portal/values.yaml                     |  2 ++
 16 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 charts/cloudprem/profiles/11-membership-multi-user.yaml

diff --git a/README.md b/README.md
index 3e6d6d9..b420ef0 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@
 | Readme | Chart Version | App Version | Description | Hub |
 |--------|---------------|-------------|-------------|-----|
 | [Agent](./charts/agent/README.md) | v2.1.0 |v2.0.18 | 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) | v2.0.0-beta.28 |v0.35.3 | 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) | v1.0.0-beta.8 |9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
+| [Cloudprem](./charts/cloudprem/README.md) | v2.0.0-beta.29 |v0.35.3 | 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) | v1.0.0-beta.9 |9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
 | [Core](./charts/core/README.md) | v1.0.0-beta.6 |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.0.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) | v1.0.0-beta.17 |v0.35.3 | 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) | v1.0.0-beta.7 |764bb7e199e1d2882e4d5cd205eada0ef0abc283 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
+| [Portal](./charts/portal/README.md) | v1.0.0-beta.8 |764bb7e199e1d2882e4d5cd205eada0ef0abc283 | 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) | v2.1.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.5.3 |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
index 9d48c20..2a94651 100644
--- a/charts/cloudprem/Chart.lock
+++ b/charts/cloudprem/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: v1.0.0-beta.17
 - name: portal
   repository: file://../portal
-  version: v1.0.0-beta.7
+  version: v1.0.0-beta.8
 - name: console
   repository: file://../console
-  version: v1.0.0-beta.8
-digest: sha256:c9a539130c6925ceebf921eccad619291c50494407326c88bcb8d07f92582b52
-generated: "2024-10-19T22:04:44.764593072Z"
+  version: v1.0.0-beta.9
+digest: sha256:02ecb5f8a264f7ce2fd70db23187feb94207c16242e4bdfdfe8c03d91f86d70e
+generated: "2024-10-21T23:06:53.833102971Z"
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
index c8ab3ad..09dfe18 100644
--- 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: "v2.0.0-beta.28"
+version: "v2.0.0-beta.29"
 
 # 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
@@ -49,10 +49,10 @@ dependencies:
     repository: file://../membership
     condition: membership.enabled
   - name: portal
-    version: v1.0.0-beta.7
+    version: v1.0.0-beta.8
     repository: file://../portal
     condition: portal.enabled
   - name: console
-    version: v1.0.0-beta.8
+    version: v1.0.0-beta.9
     repository: file://../console
     condition: console.enabled
diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
index bb777ac..2441db0 100644
--- 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: v2.0.0-beta.28](https://img.shields.io/badge/Version-v2.0.0--beta.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
+![Version: v2.0.0-beta.29](https://img.shields.io/badge/Version-v2.0.0--beta.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
 
 # Formance Cloudprem Helm Chart
 
@@ -470,6 +470,7 @@ Dex:
 | console.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | console.image.repository | string | `"ghcr.io/formancehq/console"` | image repository |
 | console.image.tag | string | `"9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb"` | image tag |
+| console.imagePullSecrets | list | `[]` | image pull secrets |
 | console.ingress.annotations | object | `{}` | ingress annotations |
 | console.ingress.className | string | `""` | ingress class name |
 | console.ingress.enabled | bool | `true` | ingress enabled |
@@ -587,6 +588,7 @@ Dex:
 | portal.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | portal.image.repository | string | `"ghcr.io/formancehq/membership-ui"` | image repository |
 | portal.image.tag | string | `"764bb7e199e1d2882e4d5cd205eada0ef0abc283"` | image tag |
+| portal.imagePullSecrets | list | `[]` |  |
 | portal.ingress.annotations | object | `{}` | ingress annotations |
 | portal.ingress.className | string | `""` | ingress class name |
 | portal.ingress.enabled | bool | `true` | ingress enabled |
diff --git a/charts/cloudprem/profiles/11-membership-multi-user.yaml b/charts/cloudprem/profiles/11-membership-multi-user.yaml
new file mode 100644
index 0000000..08b8437
--- /dev/null
+++ b/charts/cloudprem/profiles/11-membership-multi-user.yaml
@@ -0,0 +1,32 @@
+global:
+  postgresql:
+    auth:
+      username: formance
+      password: formance
+      existingSecret: ""
+
+membership:
+  # -- bind AWS ARN
+  serviceAccount:
+    create: true
+    name: ""
+    annotations: {}
+
+  config:
+    migration:
+      # -- bind AWS ARN
+      serviceAccount:
+        create: true
+        name: ""
+        annotations: {}
+      postgresql:
+        auth:
+          username: formance2
+          password: formance2
+          existingSecret: ""
+
+# When internal postgresql is enabled only global is installed
+# It need to be added using "bitnami/postgresql" chart
+# or disabling internal postgresql
+postgresql:
+  enabled: true
diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
index 5b28969..79dd52e 100644
--- a/charts/console/Chart.yaml
+++ b/charts/console/Chart.yaml
@@ -22,7 +22,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: "v1.0.0-beta.8"
+version: "v1.0.0-beta.9"
 
 # 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/console/README.md b/charts/console/README.md
index ad6f2ce..cfb9d4f 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -1,6 +1,6 @@
 # console
 
-![Version: v1.0.0-beta.8](https://img.shields.io/badge/Version-v1.0.0--beta.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb](https://img.shields.io/badge/AppVersion-9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb-informational?style=flat-square)
+![Version: v1.0.0-beta.9](https://img.shields.io/badge/Version-v1.0.0--beta.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb](https://img.shields.io/badge/AppVersion-9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb-informational?style=flat-square)
 
 Formance Console
 
@@ -77,6 +77,7 @@ Kubernetes: `>=1.14.0-0`
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/formancehq/console"` | image repository |
 | image.tag | string | `"9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb"` | image tag |
+| imagePullSecrets | list | `[]` | image pull secrets |
 | ingress.annotations | object | `{}` | ingress annotations |
 | ingress.className | string | `""` | ingress class name |
 | ingress.enabled | bool | `true` | ingress enabled |
diff --git a/charts/console/templates/deployment.yaml b/charts/console/templates/deployment.yaml
index 873bc77..2b9dc4c 100644
--- a/charts/console/templates/deployment.yaml
+++ b/charts/console/templates/deployment.yaml
@@ -15,6 +15,10 @@ spec:
         {{- include "core.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccountName:  {{ include "core.serviceAccountName" . }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: console
           command:
diff --git a/charts/console/values.schema.json b/charts/console/values.schema.json
index 984be0a..44f83fe 100644
--- a/charts/console/values.schema.json
+++ b/charts/console/values.schema.json
@@ -203,6 +203,9 @@
             },
             "type": "object"
         },
+        "imagePullSecrets": {
+            "type": "array"
+        },
         "ingress": {
             "properties": {
                 "annotations": {
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 625841e..448ce81 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -95,6 +95,9 @@ image:
   # -- image tag
   tag: 9431e5f4b4b1a03cb8f02ef1676507b9c023f2bb
 
+# -- image pull secrets
+imagePullSecrets: []
+
 # -- Console resources
 resources:
   {}
diff --git a/charts/membership/values.yaml b/charts/membership/values.yaml
index 1d9d848..5023f3f 100644
--- a/charts/membership/values.yaml
+++ b/charts/membership/values.yaml
@@ -592,6 +592,7 @@ dex:
   configOverrides:
     storage:
       type: postgres
+      
     oauth2:
       # -- oauth2 skip approval screen
       # @section -- Dex configuration
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
index d074aa3..e500991 100644
--- a/charts/portal/Chart.yaml
+++ b/charts/portal/Chart.yaml
@@ -23,7 +23,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: "v1.0.0-beta.7"
+version: "v1.0.0-beta.8"
 
 # 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/portal/README.md b/charts/portal/README.md
index 6757f8a..2b10bd9 100644
--- a/charts/portal/README.md
+++ b/charts/portal/README.md
@@ -1,6 +1,6 @@
 # portal
 
-![Version: v1.0.0-beta.7](https://img.shields.io/badge/Version-v1.0.0--beta.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 764bb7e199e1d2882e4d5cd205eada0ef0abc283](https://img.shields.io/badge/AppVersion-764bb7e199e1d2882e4d5cd205eada0ef0abc283-informational?style=flat-square)
+![Version: v1.0.0-beta.8](https://img.shields.io/badge/Version-v1.0.0--beta.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 764bb7e199e1d2882e4d5cd205eada0ef0abc283](https://img.shields.io/badge/AppVersion-764bb7e199e1d2882e4d5cd205eada0ef0abc283-informational?style=flat-square)
 
 Formance Portal
 
@@ -70,6 +70,7 @@ Kubernetes: `>=1.14.0-0`
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/formancehq/membership-ui"` | image repository |
 | image.tag | string | `"764bb7e199e1d2882e4d5cd205eada0ef0abc283"` | image tag |
+| imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` | ingress annotations |
 | ingress.className | string | `""` | ingress class name |
 | ingress.enabled | bool | `true` | ingress enabled |
diff --git a/charts/portal/templates/deployment.yaml b/charts/portal/templates/deployment.yaml
index 948e8cd..cc6bfd6 100644
--- a/charts/portal/templates/deployment.yaml
+++ b/charts/portal/templates/deployment.yaml
@@ -15,6 +15,10 @@ spec:
         {{- include "core.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "core.serviceAccountName" . }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ include "core.fullname" . }}
           resources:
diff --git a/charts/portal/values.schema.json b/charts/portal/values.schema.json
index c4560f1..a6a2593 100644
--- a/charts/portal/values.schema.json
+++ b/charts/portal/values.schema.json
@@ -200,6 +200,9 @@
             },
             "type": "object"
         },
+        "imagePullSecrets": {
+            "type": "array"
+        },
         "ingress": {
             "properties": {
                 "annotations": {
diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
index 1939475..ddc7f67 100644
--- a/charts/portal/values.yaml
+++ b/charts/portal/values.yaml
@@ -87,6 +87,8 @@ image:
   # -- image tag
   tag: 764bb7e199e1d2882e4d5cd205eada0ef0abc283
 
+imagePullSecrets: []
+
 serviceAccount:
   # -- Service account creation
   create: true