add password for nats

aenix-io · Nov 15, 2024 · 46a519d · 46a519d
1 parent bfbde07
commit 46a519d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,19 +1,4 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
-  hooks:
-    - id: end-of-file-fixer
-    - id: trailing-whitespace
-    - id: mixed-line-ending
-      args: [--fix=lf]
-    - id: check-yaml
-      exclude: '^.*templates/.*\.yaml$'
-      args: [--unsafe]
-- repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.42.0
-  hooks:
-    - id: markdownlint
-      args: [--fix, --disable, MD013, MD041, --]
 -   repo: local
     hooks:
     - id: gen-versions-map

diff --git 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
@@ -9,4 +9,5 @@
 | `external`     | Enable external access from outside the cluster | `false` |
 | `replicas`     | Persistent Volume size for NATS                 | `2`     |
 | `storageClass` | StorageClass used to store the data             | `""`    |
-
+| `username`     | Nats username, if empty no auth                 | `""`    |
+| `password`     | Nats password, if empty no auth                 | `""`    |
diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml
@@ -18,6 +18,13 @@ spec:
     nats:
       fullnameOverride: {{ .Release.Name }}
       config:
+        {{- if and .Values.username .Values.password }}
+        merge:
+          accounts:
+            A:
+              users:
+              - {user: "{{ .Values.username }}", password: "{{ .Values.password }}"}
+        {{- end }}
         cluster:
           enabled: true
           replicas: {{ .Values.replicas }}

diff --git a/packages/apps/nats/values.schema.json b/packages/apps/nats/values.schema.json
@@ -16,6 +16,16 @@
             "type": "string",
             "description": "StorageClass used to store the data",
             "default": ""
+        },
+        "username": {
+            "type": "string",
+            "description": "Nats username, if empty no auth",
+            "default": ""
+        },
+        "password": {
+            "type": "string",
+            "description": "Nats password, if empty no auth",
+            "default": ""
         }
     }
-}
+}
diff --git a/packages/apps/nats/values.yaml b/packages/apps/nats/values.yaml
@@ -4,7 +4,11 @@
 ## @param external Enable external access from outside the cluster
 ## @param replicas Persistent Volume size for NATS
 ## @param storageClass StorageClass used to store the data
+## @param nats username, if empty no auth
+## @param nats password, if empty no auth
 ##
 external: false
 replicas: 2
 storageClass: ""
+username:
+password:
diff --git 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/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