diff --git a/packages/apps/nats/Chart.yaml b/packages/apps/nats/Chart.yaml index 94aecd6a..b64b6dde 100644 --- a/packages/apps/nats/Chart.yaml +++ b/packages/apps/nats/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.2.0 +version: 0.3.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/packages/apps/nats/README.md b/packages/apps/nats/README.md index 11d4b575..19ed3ae0 100644 --- a/packages/apps/nats/README.md +++ b/packages/apps/nats/README.md @@ -10,3 +10,8 @@ | `replicas` | Persistent Volume size for NATS | `2` | | `storageClass` | StorageClass used to store the data | `""` | +### Configuration parameters + +| Name | Description | Value | +| ----------- | ----------------------- | ----- | +| `users` | Users configuration | `{}` | diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml index 1872bfce..a6fb256b 100644 --- a/packages/apps/nats/templates/nats.yaml +++ b/packages/apps/nats/templates/nats.yaml @@ -18,6 +18,18 @@ spec: nats: fullnameOverride: {{ .Release.Name }} config: + {{- if .Values.users }} + {{- if gt (len .Values.users) 0 }} + merge: + accounts: + A: + users: + {{- range $username, $userConfig := .Values.users }} + - user: "{{ $username }}" + password: "{{ $userConfig.password }}" + {{- end }} + {{- end }} + {{- end }} cluster: enabled: true replicas: {{ .Values.replicas }} diff --git a/packages/apps/nats/values.schema.json b/packages/apps/nats/values.schema.json index df176502..7bbb9bf5 100644 --- a/packages/apps/nats/values.schema.json +++ b/packages/apps/nats/values.schema.json @@ -2,20 +2,35 @@ "title": "Chart Values", "type": "object", "properties": { - "external": { - "type": "boolean", - "description": "Enable external access from outside the cluster", - "default": false + "external": { + "type": "boolean", + "description": "Enable external access from outside the cluster", + "default": false + }, + "replicas": { + "type": "number", + "description": "Persistent Volume size for NATS", + "default": 2 + }, + "storageClass": { + "type": "string", + "description": "StorageClass used to store the data", + "default": "" + }, + "users": { + "type": "object", + "description": "Users configuration", + "additionalProperties": { + "type": "object", + "properties": { + "password": { + "type": "string", + "description": "Password for the user" + } + }, + "required": ["password"] }, - "replicas": { - "type": "number", - "description": "Persistent Volume size for NATS", - "default": 2 - }, - "storageClass": { - "type": "string", - "description": "StorageClass used to store the data", - "default": "" - } + "default": {} + } } -} \ No newline at end of file + } diff --git a/packages/apps/nats/values.yaml b/packages/apps/nats/values.yaml index 7044641c..6ac9bca2 100644 --- a/packages/apps/nats/values.yaml +++ b/packages/apps/nats/values.yaml @@ -8,3 +8,11 @@ external: false replicas: 2 storageClass: "" +## @param users [object] Users configuration +## Example: +## users: +## user1: +## password: strongpassword +## user2: +## password: hackme +users: {} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index bf10e95c..e64027d1 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -48,7 +48,8 @@ mysql 0.5.0 4b84798 mysql 0.5.1 fab5940b mysql 0.5.2 HEAD nats 0.1.0 5ca8823 -nats 0.2.0 HEAD +nats 0.2.0 c07c4bbd +nats 0.3.0 HEAD postgres 0.1.0 f642698 postgres 0.2.0 7cd7de73 postgres 0.2.1 4a97e297 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 79c09a4a..827df463 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/aenix-io/cozystack/cozystack:v0.18.0@sha256:8c0e75ca3c9cbc8289cff7955f83e6d52d077cbb0e1328e64a82026c7bea19b5 + image: kklinch0/cozystack:8.1.2@sha256:bb27628e0a9c1399483f21239805e4c306fc1ef4131e10bd18cbe38f2e32d987 diff --git a/packages/system/nats/values.yaml b/packages/system/nats/values.yaml index 239b91c4..a28cadbe 100644 --- a/packages/system/nats/values.yaml +++ b/packages/system/nats/values.yaml @@ -5,3 +5,7 @@ nats: persistentVolumeClaimRetentionPolicy: whenDeleted: Delete whenScaled: Delete + config: + cluster: + routeURLs: + k8sClusterDomain: cozy.local