diff --git a/README.md b/README.md index 6f11ff4..dad35ec 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ | 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.27 |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) | +| [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) | | [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.16 |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) | +| [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) | | [Regions](./charts/regions/README.md) | v2.1.1 |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.2 |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) | +| [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) | ## How to contribute diff --git a/charts/cloudprem/Chart.lock b/charts/cloudprem/Chart.lock index ed04704..9d48c20 100644 --- a/charts/cloudprem/Chart.lock +++ b/charts/cloudprem/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: membership repository: file://../membership - version: v1.0.0-beta.16 + version: v1.0.0-beta.17 - name: portal repository: file://../portal version: v1.0.0-beta.7 - name: console repository: file://../console version: v1.0.0-beta.8 -digest: sha256:6e958c482ab5d378e0865db3c361080a48783cbdaa71796d8429bc3f5918e0ef -generated: "2024-10-18T12:59:12.667370019Z" +digest: sha256:c9a539130c6925ceebf921eccad619291c50494407326c88bcb8d07f92582b52 +generated: "2024-10-19T22:04:44.764593072Z" diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml index b1f6223..c8ab3ad 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.27" +version: "v2.0.0-beta.28" # 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 @@ -45,7 +45,7 @@ sources: [] dependencies: - name: membership - version: v1.0.0-beta.16 + version: v1.0.0-beta.17 repository: file://../membership condition: membership.enabled - name: portal diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md index a5f2242..bb777ac 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.27](https://img.shields.io/badge/Version-v2.0.0--beta.27-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.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) # Formance Cloudprem Helm Chart @@ -421,6 +421,14 @@ Dex: | membership.dex.ingress.tls | list | `[]` | Dex ingress tls | | membership.dex.resources | object | `{}` | Dex resources | +### Membership Feature + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| membership.feature.disableEvents | bool | `true` | Membership feature disable events | +| membership.feature.managedStacks | bool | `true` | Membership feature managed stacks | +| membership.feature.migrationHooks | bool | `true` | Run migration in a hook | + ### Postgresql configuration | Key | Type | Default | Description | @@ -435,10 +443,10 @@ Dex: | Key | Type | Default | Description | |-----|------|---------|-------------| | global.nats.auth.existingSecret | string | `""` | | -| global.nats.auth.password | string | `nil` | | +| global.nats.auth.password | string | `""` | | | global.nats.auth.secretKeys.password | string | `"password"` | | | global.nats.auth.secretKeys.username | string | `"username"` | | -| global.nats.auth.user | string | `nil` | | +| global.nats.auth.user | string | `""` | | | global.nats.enabled | bool | `false` | | | global.platform.membership.oidc.host | string | `"dex.{{ .Values.global.serviceHost }}"` | is the host for the oidc | | global.platform.membership.oidc.scheme | string | `"https"` | is the scheme for the issuer | @@ -500,11 +508,8 @@ Dex: | membership.config.job | object | `{"garbageCollector":{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"0 0 * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]},"stackLifeCycle":{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"*/30 * * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}}` | CronJob to manage the stack life cycle and the garbage collector | | membership.config.job.garbageCollector | object | `{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"0 0 * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}` | Clean expired tokens and refresh tokens after X time | | membership.config.job.stackLifeCycle | object | `{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"*/30 * * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}` | Job create 2 jobs to eaither warn or prune a stacks This does not change the state of the stack WARN: Mark stack Disposable -> trigger a mail PRUNE: Mark stack Warned -> trigger a mail It blocks stack cycles if supendend It is highly recommended to enable it as it is the only way we control | -| membership.config.migration.annotations | object | `{"helm.sh/hook":"pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation,hook-succeeded,hook-failed"}` | Membership job migration annotations | -| membership.config.migration.annotations."helm.sh/hook" | string | `"pre-upgrade"` | Membership migration helm hook | -| membership.config.migration.annotations."helm.sh/hook-delete-policy" | string | `"before-hook-creation,hook-succeeded,hook-failed"` | Membership migration hook delete policy | -| membership.config.migration.serviceAccount.annotations."helm.sh/hook" | string | `"pre-upgrade"` | Membership migration helm hook | -| membership.config.migration.serviceAccount.annotations."helm.sh/hook-delete-policy" | string | `"before-hook-creation,hook-succeeded,hook-failed"` | Membership migration hook delete policy | +| membership.config.migration.annotations | object | `{}` | Membership job migration annotations | +| membership.config.migration.serviceAccount.annotations | object | `{}` | | | membership.config.migration.serviceAccount.create | bool | `true` | | | membership.config.migration.serviceAccount.name | string | `""` | | | membership.config.migration.ttlSecondsAfterFinished | string | `""` | | @@ -533,8 +538,6 @@ Dex: | membership.config.stack.minimalStackModules[3] | string | `"Gateway"` | | | membership.debug | bool | `false` | Membership debug | | membership.dev | bool | `false` | Membership dev | -| membership.feature.disableEvents | bool | `true` | Membership feature disable events | -| membership.feature.managedStacks | bool | `true` | Membership feature managed stacks | | membership.fullnameOverride | string | `""` | Membership fullname override | | membership.image.pullPolicy | string | `"IfNotPresent"` | Membership image pull policy | | membership.image.repository | string | `"ghcr.io/formancehq/membership"` | Membership image repository | diff --git a/charts/membership/Chart.yaml b/charts/membership/Chart.yaml index c29a960..e45a0f3 100644 --- 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: "v1.0.0-beta.16" +version: "v1.0.0-beta.17" # 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 index 3410615..2c684b4 100644 --- a/charts/membership/README.md +++ b/charts/membership/README.md @@ -1,6 +1,6 @@ # membership -![Version: v1.0.0-beta.16](https://img.shields.io/badge/Version-v1.0.0--beta.16-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: v1.0.0-beta.17](https://img.shields.io/badge/Version-v1.0.0--beta.17-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 Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. @@ -103,6 +103,14 @@ Kubernetes: `>=1.14.0-0` | dex.ingress.tls | list | `[]` | Dex ingress tls | | dex.resources | object | `{}` | Dex resources | +### Membership Feature + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| feature.disableEvents | bool | `true` | Membership feature disable events | +| feature.managedStacks | bool | `true` | Membership feature managed stacks | +| feature.migrationHooks | bool | `true` | Run migration in a hook | + ### Postgresql configuration | Key | Type | Default | Description | @@ -117,10 +125,10 @@ Kubernetes: `>=1.14.0-0` | Key | Type | Default | Description | |-----|------|---------|-------------| | global.nats.auth.existingSecret | string | `""` | | -| global.nats.auth.password | string | `nil` | | +| global.nats.auth.password | string | `""` | | | global.nats.auth.secretKeys.password | string | `"password"` | | | global.nats.auth.secretKeys.username | string | `"username"` | | -| global.nats.auth.user | string | `nil` | | +| global.nats.auth.user | string | `""` | | | global.nats.enabled | bool | `false` | | | additionalEnv | list | `[]` | | | affinity | object | `{}` | Membership affinity | @@ -135,11 +143,8 @@ Kubernetes: `>=1.14.0-0` | config.job | object | `{"garbageCollector":{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"0 0 * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]},"stackLifeCycle":{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"*/30 * * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}}` | CronJob to manage the stack life cycle and the garbage collector | | config.job.garbageCollector | object | `{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"0 0 * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}` | Clean expired tokens and refresh tokens after X time | | config.job.stackLifeCycle | object | `{"concurrencyPolicy":"Forbid","enabled":false,"resources":{},"restartPolicy":"Never","schedule":"*/30 * * * *","startingDeadlineSeconds":200,"suspend":false,"tolerations":[],"volumeMounts":[],"volumes":[]}` | Job create 2 jobs to eaither warn or prune a stacks This does not change the state of the stack WARN: Mark stack Disposable -> trigger a mail PRUNE: Mark stack Warned -> trigger a mail It blocks stack cycles if supendend It is highly recommended to enable it as it is the only way we control | -| config.migration.annotations | object | `{"helm.sh/hook":"pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation,hook-succeeded,hook-failed"}` | Membership job migration annotations | -| config.migration.annotations."helm.sh/hook" | string | `"pre-upgrade"` | Membership migration helm hook | -| config.migration.annotations."helm.sh/hook-delete-policy" | string | `"before-hook-creation,hook-succeeded,hook-failed"` | Membership migration hook delete policy | -| config.migration.serviceAccount.annotations."helm.sh/hook" | string | `"pre-upgrade"` | Membership migration helm hook | -| config.migration.serviceAccount.annotations."helm.sh/hook-delete-policy" | string | `"before-hook-creation,hook-succeeded,hook-failed"` | Membership migration hook delete policy | +| config.migration.annotations | object | `{}` | Membership job migration annotations | +| config.migration.serviceAccount.annotations | object | `{}` | | | config.migration.serviceAccount.create | bool | `true` | | | config.migration.serviceAccount.name | string | `""` | | | config.migration.ttlSecondsAfterFinished | string | `""` | | @@ -168,8 +173,6 @@ Kubernetes: `>=1.14.0-0` | config.stack.minimalStackModules[3] | string | `"Gateway"` | | | debug | bool | `false` | Membership debug | | dev | bool | `false` | Membership dev | -| feature.disableEvents | bool | `true` | Membership feature disable events | -| feature.managedStacks | bool | `true` | Membership feature managed stacks | | fullnameOverride | string | `""` | Membership fullname override | | image.pullPolicy | string | `"IfNotPresent"` | Membership image pull policy | | image.repository | string | `"ghcr.io/formancehq/membership"` | Membership image repository | diff --git a/charts/membership/templates/_helpers.tpl b/charts/membership/templates/_helpers.tpl index eefaad7..6aca922 100644 --- a/charts/membership/templates/_helpers.tpl +++ b/charts/membership/templates/_helpers.tpl @@ -178,3 +178,19 @@ staticClients: {{- end }} {{- end }} {{- end }} + +{{- define "migrations.job.annotations" -}} +{{- if and (not .Release.IsInstall) .Values.feature.migrationHooks }} +helm.sh/hook: pre-upgrade +helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded,hook-failed +helm.sh/hook-weight: "10" +{{- end }} +{{- end }} + +{{- define "migrations.job.sa.annotations" -}} +{{- if and (not .Release.IsInstall) .Values.feature.migrationHooks }} +helm.sh/hook: pre-upgrade +helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded,hook-failed +helm.sh/hook-weight: "-10" +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/membership/templates/job.yaml b/charts/membership/templates/job.yaml index 26263b2..34192b5 100644 --- a/charts/membership/templates/job.yaml +++ b/charts/membership/templates/job.yaml @@ -4,7 +4,7 @@ metadata: name: {{ include "core.fullname" . }} labels: {{- include "core.labels" . | nindent 4 }} - {{- with .Values.config.migration.annotations }} + {{- with merge .Values.config.migration.annotations (include "migrations.job.annotations" . | fromYaml) }} annotations: {{- toYaml . | nindent 4 }} {{- end }} @@ -52,7 +52,6 @@ spec: {{- include "core.env.common" . | nindent 10 }} {{- include "core.nats.env" . | nindent 10 }} {{- end }} - {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/membership/templates/job_sa.yaml b/charts/membership/templates/job_sa.yaml index 65a3784..3ef397f 100644 --- a/charts/membership/templates/job_sa.yaml +++ b/charts/membership/templates/job_sa.yaml @@ -5,7 +5,7 @@ metadata: name: {{ include "membership.job.serviceAccountName" . }} labels: {{- include "core.labels" . | nindent 4 }} - {{- with .Values.config.migration.serviceAccount.annotations }} + {{- with merge .Values.config.migration.serviceAccount.annotations (include "migrations.job.sa.annotations" . | fromYaml) }} annotations: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/charts/membership/values.schema.json b/charts/membership/values.schema.json index c4a9a94..74edc1a 100644 --- a/charts/membership/values.schema.json +++ b/charts/membership/values.schema.json @@ -199,14 +199,7 @@ "migration": { "properties": { "annotations": { - "properties": { - "helm.sh/hook": { - "type": "string" - }, - "helm.sh/hook-delete-policy": { - "type": "string" - } - }, + "properties": {}, "type": "object" }, "postgresql": { @@ -239,14 +232,7 @@ "serviceAccount": { "properties": { "annotations": { - "properties": { - "helm.sh/hook": { - "type": "string" - }, - "helm.sh/hook-delete-policy": { - "type": "string" - } - }, + "properties": {}, "type": "object" }, "create": { @@ -546,6 +532,9 @@ }, "managedStacks": { "type": "boolean" + }, + "migrationHooks": { + "type": "boolean" } }, "type": "object" @@ -619,7 +608,7 @@ "type": "string" }, "password": { - "type": "null" + "type": "string" }, "secretKeys": { "properties": { @@ -633,7 +622,7 @@ "type": "object" }, "user": { - "type": "null" + "type": "string" } }, "type": "object" diff --git a/charts/membership/values.yaml b/charts/membership/values.yaml index 757e6cd..1d9d848 100644 --- a/charts/membership/values.yaml +++ b/charts/membership/values.yaml @@ -74,8 +74,8 @@ global: # @section -- Global configuration url: "" auth: - user: - password: + user: "" + password: "" existingSecret: "" secretKeys: password: password @@ -310,13 +310,18 @@ aws: additionalEnv: [] -# See helm tags for more information +# TODO: See helm tags for more information # https://helm.sh/docs/chart_template_guide/variables/#tags feature: # -- Membership feature managed stacks + # @section -- Membership Feature managedStacks: true # -- Membership feature disable events + # @section -- Membership Feature disableEvents: true + # -- Run migration in a hook + # @section -- Membership Feature + migrationHooks: true config: # -- Enable Fctl @@ -465,19 +470,11 @@ config: serviceAccount: create: true name: "" - annotations: - # -- Membership migration helm hook - helm.sh/hook: pre-upgrade - # -- Membership migration hook delete policy - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded,hook-failed + annotations: {} # -- Membership job migration annotations annotations: - # -- Membership migration helm hook - helm.sh/hook: pre-upgrade - # -- Membership migration hook delete policy - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded,hook-failed - + {} # Argo CD translate `pre-install,pre-upgrade` to: argocd.argoproj.io/hook: PreSync ttlSecondsAfterFinished: "" diff --git a/charts/stargate/Chart.yaml b/charts/stargate/Chart.yaml index 8ea158a..97a7bec 100644 --- a/charts/stargate/Chart.yaml +++ b/charts/stargate/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: 0.5.2 +version: 0.5.3 # 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/stargate/README.md b/charts/stargate/README.md index ae80bbd..2f9c986 100644 --- a/charts/stargate/README.md +++ b/charts/stargate/README.md @@ -1,6 +1,6 @@ # stargate -![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) +![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) Formance Stargate gRPC Gateway @@ -63,6 +63,11 @@ Formance Stargate gRPC Gateway | Key | Type | Default | Description | |-----|------|---------|-------------| | global.debug | bool | `false` | Enable debug mode | +| global.nats.auth.existingSecret | string | `""` | | +| global.nats.auth.password | string | `nil` | | +| global.nats.auth.secretKeys.password | string | `"password"` | | +| global.nats.auth.secretKeys.username | string | `"username"` | | +| global.nats.auth.user | string | `nil` | | | global.serviceHost | string | `""` | is the base domain for portal and console | | affinity | object | `{}` | Affinity for pod assignment | | autoscaling.enabled | bool | `false` | | diff --git a/charts/stargate/templates/deployment.yaml b/charts/stargate/templates/deployment.yaml index e5b74ba..c4c611e 100644 --- a/charts/stargate/templates/deployment.yaml +++ b/charts/stargate/templates/deployment.yaml @@ -50,9 +50,9 @@ spec: - name: AUTH_ISSUER_URL value: "{{ tpl .Values.config.auth_issuer_url . }}" - name: GRPC_ADDR - value: "0.0.0.0:{{ .Values.service.ports.grpc | default 3068 }}" + value: "0.0.0.0:{{ .Values.service.ports.grpc.port| default 3068 }}" - name: HTTP_ADDR - value: "0.0.0.0:{{ .Values.service.ports.http | default 8080 }}" + value: "0.0.0.0:{{ .Values.service.ports.http.port | default 8080 }}" {{- include "core.postgres.uri" . | nindent 12 }} {{- include "aws.iam.postgres" . | nindent 12 }} {{- include "core.nats.env" . | nindent 12 }} diff --git a/charts/stargate/values.schema.json b/charts/stargate/values.schema.json index b63b80a..2d01c56 100644 --- a/charts/stargate/values.schema.json +++ b/charts/stargate/values.schema.json @@ -170,6 +170,31 @@ }, "nats": { "properties": { + "auth": { + "properties": { + "existingSecret": { + "type": "string" + }, + "password": { + "type": "null" + }, + "secretKeys": { + "properties": { + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + }, + "type": "object" + }, + "user": { + "type": "null" + } + }, + "type": "object" + }, "enabled": { "type": "boolean" }, diff --git a/charts/stargate/values.yaml b/charts/stargate/values.yaml index 4bd8cf1..734b088 100644 --- a/charts/stargate/values.yaml +++ b/charts/stargate/values.yaml @@ -68,6 +68,13 @@ global: # -- URL for NATS # @section -- Global Nats configuration url: "" + auth: + user: + password: + existingSecret: "" + secretKeys: + password: password + username: username postgresql: # -- Host for PostgreSQL (overrides included postgreql `host`)