Skip to content

Commit df971a5

Browse files
Dav-14Dav-14
committed
fix(consolev2,consolev3): API_URL also depends on stargate
1 parent bd70dfa commit df971a5

File tree

13 files changed

+97
-24
lines changed

13 files changed

+97
-24
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
|--------|---------------|-------------|-------------|-----|
77
| [Agent](./charts/agent/README.md) | 2.7.0 | v2.3.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) |
88
| [Cloudprem](./charts/cloudprem/README.md) | 3.0.1 | 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) |
9-
| [Console](./charts/console/README.md) | 2.1.3 | 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) |
10-
| [Console-V3](./charts/console-v3/README.md) | 2.1.2 | 5e7b404a3a208b1f38603719e02a8b1883c10acf | 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) |
9+
| [Console](./charts/console/README.md) | 2.1.4 | 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) |
10+
| [Console-V3](./charts/console-v3/README.md) | 2.1.3 | 5e7b404a3a208b1f38603719e02a8b1883c10acf | 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) |
1111
| [Core](./charts/core/README.md) | 1.2.2 | 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) |
1212
| [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) |
1313
| [Membership](./charts/membership/README.md) | 2.4.0 | v1.3.2 | Formance EE 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) |

‎charts/cloudprem/Chart.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies:
77
version: 2.1.4
88
- name: console
99
repository: file://../console
10-
version: 2.1.3
10+
version: 2.1.4
1111
- name: console-v3
1212
repository: file://../console-v3
13-
version: 2.1.2
14-
digest: sha256:0c23657ca9efdd2334077ecc5d0e0cdcc948ae8cd259c5c010a7fc1850eded09
15-
generated: "2025-03-13T17:02:11.021985+01:00"
13+
version: 2.1.3
14+
digest: sha256:a01881dc0057e1c64ce47384646e1fd2dc60a50acc78aac12df428061948cdfb
15+
generated: "2025-03-13T17:21:19.063629+01:00"

‎charts/cloudprem/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,6 @@ Dex:
447447
| global.postgresql.host | string | `""` | Host for PostgreSQL (overrides included postgreql `host`) |
448448
| global.postgresql.service.ports.postgresql | int | `5432` | PostgreSQL service port (overrides `service.ports.postgresql`) |
449449
| global.serviceHost | string | `""` | is the base domain for portal and console |
450-
| console-v3.config.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie value |
451-
| console-v3.config.cookie.existingSecret | string | `""` | is the name of the secret |
452-
| console-v3.config.cookie.name | string | `""` | is the name of the cookie. It is intended to be unique when having multiple console-v3 instances. |
453-
| console-v3.config.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
454450
| membership.config.migration.enabled | bool | `true` | Enable migration job |
455451
| membership.config.migration.postgresql.auth.existingSecret | string | `""` | Name of existing secret to use for PostgreSQL credentials (overrides `auth.existingSecret`). |
456452
| membership.config.migration.postgresql.auth.password | string | `""` | Password for the "postgres" admin user (overrides `auth.postgresPassword`) |
@@ -553,6 +549,7 @@ Dex:
553549
| console.config.sentry.enabled | bool | `false` | Sentry enabled |
554550
| console.config.sentry.environment | string | `""` | Sentry environment |
555551
| console.config.sentry.release | string | `""` | Sentry release |
552+
| console.config.stargate_url | string | `""` | Deprecated |
556553
| console.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
557554
| console.image.repository | string | `"ghcr.io/formancehq/console"` | image repository |
558555
| console.image.tag | string | `""` | image tag |
@@ -596,13 +593,18 @@ Dex:
596593
| console-v3.aws.targetGroups.http.targetGroupARN | string | `""` | Target group ARN |
597594
| console-v3.aws.targetGroups.http.targetType | string | `"ip"` | Target group target type |
598595
| console-v3.config.additionalEnv | list | `[]` | Console additional environment variables |
596+
| console-v3.config.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie value |
597+
| console-v3.config.cookie.existingSecret | string | `""` | is the name of the secret |
598+
| console-v3.config.cookie.name | string | `""` | is the name of the cookie. It is intended to be unique when having multiple console-v3 instances. |
599+
| console-v3.config.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
599600
| console-v3.config.environment | string | `"production"` | Console environment |
600601
| console-v3.config.sentry | object | `{"authToken":{"existingSecret":"","secretKeys":{"value":""},"value":""},"dsn":"","enabled":false,"environment":"","release":""}` | Console additional environment variables FEATURE_DISABLED - name: FEATURE_DISABLED value: "true" |
601602
| console-v3.config.sentry.authToken | object | `{"existingSecret":"","secretKeys":{"value":""},"value":""}` | Sentry Auth Token |
602603
| console-v3.config.sentry.dsn | string | `""` | Sentry DSN |
603604
| console-v3.config.sentry.enabled | bool | `false` | Sentry enabled |
604605
| console-v3.config.sentry.environment | string | `""` | Sentry environment |
605606
| console-v3.config.sentry.release | string | `""` | Sentry release |
607+
| console-v3.config.stargate_url | string | `""` | Deprecated |
606608
| console-v3.image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
607609
| console-v3.image.repository | string | `"ghcr.io/formancehq/console-v3"` | image repository |
608610
| console-v3.image.tag | string | `""` | image tag |

‎charts/console-v3/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type: application
2929
# This is the chart version. This version number should be incremented each time you make changes
3030
# to the chart and its templates, including the app version.
3131
# Versions are expected to follow Semantic Versioning (https://semver.org/)
32-
version: 2.1.2
32+
version: 2.1.3
3333

3434
# This is the version number of the application being deployed. This version number should be
3535
# incremented each time you make changes to the application. Versions are not expected to

‎charts/console-v3/README.md‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# console-v3
22

3-
![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: 5e7b404a3a208b1f38603719e02a8b1883c10acf](https://img.shields.io/badge/AppVersion-5e7b404a3a208b1f38603719e02a8b1883c10acf-informational?style=flat-square)
3+
![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5e7b404a3a208b1f38603719e02a8b1883c10acf](https://img.shields.io/badge/AppVersion-5e7b404a3a208b1f38603719e02a8b1883c10acf-informational?style=flat-square)
44

55
Formance Console
66

@@ -57,10 +57,13 @@ Kubernetes: `>=1.14.0-0`
5757
| global.platform.portal.host | string | `"portal.{{ .Values.global.serviceHost }}"` | is the host for the portal |
5858
| global.platform.portal.scheme | string | `"https"` | is the scheme for the portal |
5959
| global.serviceHost | string | `""` | is the base domain for portal and console |
60-
| config.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie value |
61-
| config.cookie.existingSecret | string | `""` | is the name of the secret |
62-
| config.cookie.name | string | `""` | is the name of the cookie. It is intended to be unique when having multiple console-v3 instances. |
63-
| config.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
60+
61+
### Stargate configuration
62+
63+
| Key | Type | Default | Description |
64+
|-----|------|---------|-------------|
65+
| global.platform.stargate.enabled | bool | `false` | if enabled, the stackApiUrl is not required It will be templated with `{{ printf "http://%s-%s:8080/#{organizationId}/#{stackId}/api" .Release.Name "stargate" -}}` |
66+
| global.platform.stargate.stackApiUrl | string | `""` | if stargate is disabled, the stackApiUrl is defaulted to the `http://gateway.#{organizationId}-#{stackId}.svc:8080/api` To allow external access sets the stackApiUrl to an external url |
6467

6568
### Other Values
6669

@@ -78,13 +81,18 @@ Kubernetes: `>=1.14.0-0`
7881
| aws.targetGroups.http.targetGroupARN | string | `""` | Target group ARN |
7982
| aws.targetGroups.http.targetType | string | `"ip"` | Target group target type |
8083
| config.additionalEnv | list | `[]` | Console additional environment variables |
84+
| config.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie value |
85+
| config.cookie.existingSecret | string | `""` | is the name of the secret |
86+
| config.cookie.name | string | `""` | is the name of the cookie. It is intended to be unique when having multiple console-v3 instances. |
87+
| config.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
8188
| config.environment | string | `"production"` | Console environment |
8289
| config.sentry | object | `{"authToken":{"existingSecret":"","secretKeys":{"value":""},"value":""},"dsn":"","enabled":false,"environment":"","release":""}` | Console additional environment variables FEATURE_DISABLED - name: FEATURE_DISABLED value: "true" |
8390
| config.sentry.authToken | object | `{"existingSecret":"","secretKeys":{"value":""},"value":""}` | Sentry Auth Token |
8491
| config.sentry.dsn | string | `""` | Sentry DSN |
8592
| config.sentry.enabled | bool | `false` | Sentry enabled |
8693
| config.sentry.environment | string | `""` | Sentry environment |
8794
| config.sentry.release | string | `""` | Sentry release |
95+
| config.stargate_url | string | `""` | Deprecated |
8896
| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
8997
| image.repository | string | `"ghcr.io/formancehq/console-v3"` | image repository |
9098
| image.tag | string | `""` | image tag |

‎charts/console-v3/templates/_helpers.tpl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@
7272
- name: NODE_ENV
7373
value: {{ .Values.config.environment }}
7474
- name: API_URL
75-
value: {{ (default "http://gateway.#{organizationId}-#{stackId}.svc:8080/api" .Values.config.stargate_url) }}
75+
{{- if .Values.global.platform.stargate.enabled }}
76+
value: {{ printf "http://%s-%s:8080/#{organizationId}/#{stackId}/api" .Release.Name "stargate" -}}
77+
{{- else }}
78+
value: {{ default "http://gateway.#{organizationId}-#{stackId}.svc:8080/api" (default .Values.global.platform.stargate.stackApiUrl .Values.config.stargate_url) }}
79+
{{- end }}
7680
- name: PORTAL_UI
7781
value: {{ tpl (default (printf "%s://%s" .Values.global.platform.portal.scheme .Values.global.platform.portal.host) .Values.config.platform_url) $ }}
7882
{{- include "console.v3.cookie" . }}

‎charts/console-v3/values.schema.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126
}
127127
},
128128
"type": "object"
129+
},
130+
"stargate_url": {
131+
"type": "string"
129132
}
130133
},
131134
"type": "object"
@@ -235,6 +238,17 @@
235238
}
236239
},
237240
"type": "object"
241+
},
242+
"stargate": {
243+
"properties": {
244+
"enabled": {
245+
"type": "boolean"
246+
},
247+
"stackApiUrl": {
248+
"type": "string"
249+
}
250+
},
251+
"type": "object"
238252
}
239253
},
240254
"type": "object"

‎charts/console-v3/values.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ global:
6868
# @section -- Global configuration
6969
secretKeys:
7070
secret: ""
71+
stargate:
72+
# -- if enabled, the stackApiUrl is not required
73+
# It will be templated with `{{ printf "http://%s-%s:8080/#{organizationId}/#{stackId}/api" .Release.Name "stargate" -}}`
74+
# @section -- Stargate configuration
75+
enabled: false
76+
# -- if stargate is disabled, the stackApiUrl is defaulted to the `http://gateway.#{organizationId}-#{stackId}.svc:8080/api`
77+
# To allow external access sets the stackApiUrl to an external url
78+
# @section -- Stargate configuration
79+
stackApiUrl: ""
7180

7281
membership:
7382
# -- is the scheme for the membership
@@ -205,21 +214,20 @@ tolerations: []
205214
affinity: {}
206215

207216
config:
217+
# -- Deprecated
218+
stargate_url: ""
208219
cookie:
209220
# -- is the name of the cookie.
210221
# It is intended to be unique when having multiple console-v3 instances.
211-
# @section -- Global configuration
212222
name: ""
213223
# -- is used to encrypt a cookie value
214-
# @section -- Global configuration
215224
encryptionKey: "changeMe00"
216225
# -- is the name of the secret
217-
# @section -- Global configuration
218226
existingSecret: ""
219227
# -- is the key contained within the secret
220-
# @section -- Global configuration
221228
secretKeys:
222229
encryptionKey: ""
230+
223231
# -- Console environment
224232
environment: production
225233
# -- Console additional environment variables

‎charts/console/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type: application
2222
# This is the chart version. This version number should be incremented each time you make changes
2323
# to the chart and its templates, including the app version.
2424
# Versions are expected to follow Semantic Versioning (https://semver.org/)
25-
version: 2.1.3
25+
version: 2.1.4
2626

2727
# This is the version number of the application being deployed. This version number should be
2828
# incremented each time you make changes to the application. Versions are not expected to

‎charts/console/README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# console
22

3-
![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.2](https://img.shields.io/badge/AppVersion-console--on.v1.0.2-informational?style=flat-square)
3+
![Version: 2.1.4](https://img.shields.io/badge/Version-2.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.2](https://img.shields.io/badge/AppVersion-console--on.v1.0.2-informational?style=flat-square)
44

55
Formance Console
66

@@ -59,6 +59,13 @@ Kubernetes: `>=1.14.0-0`
5959
| global.platform.portal.scheme | string | `"https"` | is the scheme for the portal |
6060
| global.serviceHost | string | `""` | is the base domain for portal and console |
6161

62+
### Stargate configuration
63+
64+
| Key | Type | Default | Description |
65+
|-----|------|---------|-------------|
66+
| global.platform.stargate.enabled | bool | `false` | if enabled, the stackApiUrl is not required It will be templated with `{{ printf "http://%s-%s:8080/#{organizationId}/#{stackId}/api" .Release.Name "stargate" -}}` |
67+
| global.platform.stargate.stackApiUrl | string | `""` | if stargate is disabled, the stackApiUrl is defaulted to the `http://gateway.#{organizationId}-#{stackId}.svc:8080/api` To allow external access sets the stackApiUrl to an external url |
68+
6269
### Other Values
6370

6471
| Key | Type | Default | Description |
@@ -81,6 +88,7 @@ Kubernetes: `>=1.14.0-0`
8188
| config.sentry.enabled | bool | `false` | Sentry enabled |
8289
| config.sentry.environment | string | `""` | Sentry environment |
8390
| config.sentry.release | string | `""` | Sentry release |
91+
| config.stargate_url | string | `""` | Deprecated |
8492
| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
8593
| image.repository | string | `"ghcr.io/formancehq/console"` | image repository |
8694
| image.tag | string | `""` | image tag |

0 commit comments

Comments
 (0)