switch to natsjs registry (#427)

* switch to natsjs registry * add stream to nats stream operator for service registry * pin chart versions
owncloud · Nov 30, 2023 · c11907b · c11907b
1 parent 44074fb
commit c11907b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 14 deletions.
diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc
@@ -1019,7 +1019,7 @@ a| [subs=-attributes]
 +string+
 a| [subs=-attributes]
 `"kubernetes"`
-| Configure the service registry type. Defaults to "kubernetes". Can be set to "etcd" or "nats", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
+| Configure the service registry type. Defaults to "kubernetes". Can be set to "etcd" or "natsjs", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
 | replicas
 a| [subs=-attributes]
 +int+

diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml
@@ -108,7 +108,7 @@ store:
 registry:
   # -- Configure the service registry type.
   # Defaults to "kubernetes".
-  # Can be set to "etcd" or "nats", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
+  # Can be set to "etcd" or "natsjs", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
   type: kubernetes
   # -- Nodes of the service registry to use.
   nodes: []

diff --git a/charts/ocis/templates/_common/registry/registry.tpl b/charts/ocis/templates/_common/registry/registry.tpl
@@ -2,7 +2,7 @@
 oCIS service registry
 */}}
 {{- define "ocis.serviceRegistry" -}}
-{{- $valid := list "kubernetes" "etcd" "nats" -}}
+{{- $valid := list "kubernetes" "etcd" "natsjs" -}}
 {{- if not (has .Values.registry.type $valid) -}}
 {{- fail "invalid registry.type set" -}}
 {{- end -}}

diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml
@@ -107,7 +107,7 @@ store:
 registry:
   # -- Configure the service registry type.
   # Defaults to "kubernetes".
-  # Can be set to "etcd" or "nats", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
+  # Can be set to "etcd" or "natsjs", then the address of etcd / nats node(s) needs to be set to `registry.nodes`.
   type: kubernetes
   # -- Nodes of the service registry to use.
   nodes: []

diff --git a/deployments/ocis-nats/helmfile.yaml b/deployments/ocis-nats/helmfile.yaml
@@ -4,14 +4,15 @@ repositories:
 
 releases:
   - name: nats
-    chart: nats/nats
     namespace: ocis-nats
+    chart: nats/nats
+    version: 1.1.5
     values:
       - config:
           cluster:
-              enabled: true
-              replicas: 3
-              name: "ocis-cluster"
+            enabled: true
+            replicas: 3
+            name: "ocis-cluster"
           jetstream:
             enabled: true
           merge:
@@ -45,28 +46,29 @@ releases:
                 no_auth_user: ocis
 
   - name: nack-crds
-    chart: ./crds
     namespace: ocis-nack
+    chart: ./crds
 
   - name: nack-streams
-    chart: ./streams
     namespace: ocis-nats
+    chart: ./streams
     needs:
       - ocis-nats/nats
       - ocis-nack/nack-crds
 
   - name: nack
-    chart: nats/nack
     namespace: ocis-nack
+    chart: nats/nack
+    version: 0.25.0
     values:
       - namespaced: false
       - readOnly: false
     needs:
       - ocis-nack/nack-crds
 
   - name: ocis
-    chart: ../../charts/ocis
     namespace: ocis
+    chart: ../../charts/ocis
     values:
       - externalDomain: ocis.kube.owncloud.test
       - ingress:
@@ -91,7 +93,7 @@ releases:
               enabled: false
 
       - registry:
-          type: nats
+          type: natsjs
           nodes:
             - nats.ocis-nats.svc.cluster.local:4222
 

diff --git a/deployments/ocis-nats/streams/ocis.yaml b/deployments/ocis-nats/streams/ocis.yaml
@@ -69,10 +69,29 @@ spec:
   account: ocis-nats
 ---
 apiVersion: jetstream.nats.io/v1beta2
+kind: Stream
+metadata:
+  name: service-registry
+spec:
+  name: OBJ_service-registry
+  subjects:
+    - $O.service-registry.C.>
+    - $O.service-registry.M.>
+  replicas: 3
+  storage: file
+  retention: limits
+  discard: old
+  duplicateWindow: "2m0s"
+  maxAge: "0"
+  allowRollup: true
+  allowDirect: true
+  account: ocis-nats
+---
+apiVersion: jetstream.nats.io/v1beta2
 kind: Account
 metadata:
   name: ocis-nats
 spec:
   name: ocis-nats
   servers:
-  - nats://nats.ocis-nats.svc.cluster.local:4222
+    - nats://nats.ocis-nats.svc.cluster.local:4222