use external nats chart

owncloud · Jun 30, 2022 · 467bbad · 467bbad
1 parent 7564179
commit 467bbad
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 133 deletions.
diff --git a/charts/ocis/Chart.lock b/charts/ocis/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: nats
+  repository: https://nats-io.github.io/k8s/helm/charts
+  version: 0.17.1
+digest: sha256:708a682913434cc478909bbeb4ba267edef6b51936d26a5a8d661c66cc8efebe
+generated: "2022-06-30T10:55:21.545498481+02:00"
diff --git a/charts/ocis/Chart.yaml b/charts/ocis/Chart.yaml
@@ -15,3 +15,7 @@ sources:
   - https://github.com/owncloud/ocis-charts
   - https://github.com/owncloud/ocis
   - https://github.com/cs3org/reva
+dependencies:
+  - name: nats
+    version: 0.17.1
+    repository: https://nats-io.github.io/k8s/helm/charts
diff --git a/charts/ocis/templates/NOTES.txt b/charts/ocis/templates/NOTES.txt
@@ -18,7 +18,7 @@ You can get the initial "admin" administrator user password by running:
 
 kubectl -n <namespace> get secrets/admin-user --template='{{"{{"}}.data.password | base64decode{{"}}"}}'
 
-{{ if  or (not .Values.storageSystem.persistence.enabled) (not .Values.storageUsers.persistence.enabled) (not .Values.store.persistence.enabled) (not .Values.idm.persistence.enabled) (not .Values.search.persistence.enabled) (not .Values.nats.persistence.enabled) }}
+{{ if  or (not .Values.storageSystem.persistence.enabled) (not .Values.storageUsers.persistence.enabled) (not .Values.store.persistence.enabled) (not .Values.idm.persistence.enabled) (not .Values.search.persistence.enabled) }}
 #################################################################################
 ######   WARNING: Persistence is disabled for some services.                #####
 ######   You will lose your data when a service's pod is terminated.        #####
@@ -39,8 +39,5 @@ kubectl -n <namespace> get secrets/admin-user --template='{{"{{"}}.data.password
 {{- if not .Values.search.persistence.enabled }}
 ######     - search                                                         #####
 {{- end }}
-{{- if not .Values.nats.persistence.enabled }}
-######     - nats                                                           #####
-{{- end }}
 #################################################################################
 {{- end }}
diff --git a/charts/ocis/templates/audit/deployment.yaml b/charts/ocis/templates/audit/deployment.yaml
@@ -50,7 +50,7 @@ spec:
               value: "{{ .Values.logging.pretty }}"
 
             - name: AUDIT_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             # TODO: log to file or stdout?
             #- name: AUDIT_FILEPATH

diff --git a/charts/ocis/templates/graph/deployment.yaml b/charts/ocis/templates/graph/deployment.yaml
@@ -69,7 +69,7 @@ spec:
             - name: REVA_GATEWAY
               value: gateway:9142
             - name: GRAPH_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             - name: GRAPH_SPACES_INSECURE
               value: "{{ .Values.insecure.ocisHttpApiInsecure }}"

diff --git a/charts/ocis/templates/nats/deployment.yaml b/charts/ocis/templates/nats/deployment.yaml
diff --git a/charts/ocis/templates/nats/pvc.yaml b/charts/ocis/templates/nats/pvc.yaml
diff --git a/charts/ocis/templates/nats/service.yaml b/charts/ocis/templates/nats/service.yaml
diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml
@@ -51,7 +51,7 @@ spec:
             - name: REVA_GATEWAY
               value: gateway:9142
             - name: NOTIFICATIONS_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             - name: NOTIFICATIONS_MACHINE_AUTH_API_KEY
               valueFrom:

diff --git a/charts/ocis/templates/search/deployment.yaml b/charts/ocis/templates/search/deployment.yaml
@@ -55,7 +55,7 @@ spec:
             - name: REVA_GATEWAY
               value: gateway:9142
             - name: SEARCH_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             - name: SEARCH_MACHINE_AUTH_API_KEY
               valueFrom:

diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml
@@ -55,7 +55,7 @@ spec:
             - name: REVA_GATEWAY
               value: gateway:9142
             - name: SHARING_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             - name: SHARING_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/storage-users/deployment.yaml b/charts/ocis/templates/storage-users/deployment.yaml
@@ -87,7 +87,7 @@ spec:
 
             # events
             - name: STORAGE_USERS_EVENTS_ENDPOINT
-              value: nats:9233
+              value: ocis-nats:4222
 
             - name: REVA_GATEWAY
               value: gateway:9142

diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml
@@ -148,17 +148,42 @@ search:
     # existingClaim:
 
 nats:
-  persistence:
+  cluster:
+    enabled: true
+    name: "ocis-cluster"
+    replicas: 3
+  natsbox:
     enabled: false
-    # storageClassName: default
-    accessModes:
-      - ReadWriteMany
-    size: 10Gi
-    annotations: {}
-    finalizers:
-      - kubernetes.io/pvc-protection
-    selectorLabels: {}
-    # existingClaim:
+  nats:
+    client:
+      port: 4222
+
+    #externalAccess: true
+    #advertise: true
+
+    jetstream:
+      enabled: true
+
+      memStorage:
+        enabled: true
+        size: 2Gi
+
+      fileStorage:
+        enabled: true
+        size: 10Gi
+        # storageClassName: default # The Storage Class used should be block storage. NFS is not recommended.
+
+  # persistence:
+  #   enabled: false
+  #   # storageClassName: default
+  #   accessModes:
+  #     - ReadWriteMany
+  #   size: 10Gi
+  #   annotations: {}
+  #   finalizers:
+  #     - kubernetes.io/pvc-protection
+  #   selectorLabels: {}
+  #   # existingClaim:
 
 # global options for scalable service
 replicas: 1