update externalinvocation

Author: eliasdarruda

docs/getting_started.md

@@ -251,10 +251,12 @@ metadata:
   name: spawn-system # 1. Required. Name of the ActorSystem
   namespace: default # 2. Optional. Default namespace is "default"
 spec:
-  # This externalInvocation section is required only if using the Nats broker in your project.
-  externalInvocation:
-    enabled: "true"
-    externalConnectorRef: nats-invocation-conn-secret # 3. Nats broker credentials
+  cluster:
+    features:
+      # This nats section is required only if using the Nats broker in your project.
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: MariaDB # 4. Set database provider. Valid options: [MariaDB, Postgres, Native]
     credentialsSecretRef: mariadb-connection-secret # 5. Secret with database connection details created earlier

examples/activators/cron.yaml

@@ -10,7 +10,7 @@ metadata:
 spec:
   activator:
     type: Cron
-    externalConnectorRef: invocation-connection-ref-secret
+    externalConnectorRef: nats-invocation-conn-secret
   bindings:
     sources:
       - name: minute-scheduler

examples/secret/invocation-connection-secret-example.txt

@@ -1,4 +1,4 @@
-kubectl -n default create secret generic invocation-connection-ref-secret \
+kubectl -n default create secret generic nats-invocation-conn-secret \
   --from-literal=url=spawn-nats:4222 \
   --from-literal=authEnabled="false" \
   --from-literal=tlsEnabled="false" \

examples/security/acl/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system # Mandatory. Name of the state store
   namespace: default # Optional. Default namespace is "default"
 spec:
-  externalInvocation:
-    enabled: "true"
-    externalConnectorRef: invocation-connection-ref-secret
+  cluster:
+    features:
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret"
   statestore:
     type: MySql
     credentialsSecretRef: mysql-connection-secret # The secret containing connection params

examples/security/authentication/basic/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system # Mandatory. Name of the state store
   namespace: default # Optional. Default namespace is "default"
 spec:
-  externalInvocation:
-    enabled: "true"
-    externalConnectorRef: invocation-connection-ref-secret
+  cluster:
+    features:
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: MySql
     credentialsSecretRef: mysql-connection-secret # The secret containing connection params

examples/security/authentication/jwt/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system # Mandatory. Name of the state store
   namespace: default # Optional. Default namespace is "default"
 spec:
-  externalInvocation:
-    enabled: "true"
-    externalConnectorRef: invocation-connection-ref-secret
+  cluster:
+    features:
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: MySql
     credentialsSecretRef: mysql-connection-secret # The secret containing connection params

examples/simple/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system # Mandatory. Name of the state store
   namespace: default # Optional. Default namespace is "default"
 spec:
-  # externalInvocation:
-  #   enabled: "true"
-  #   externalConnectorRef: invocation-connection-ref-secret
+  # cluster:
+  #   features:
+  #     nats:
+  #       enabled: true
+  #       credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: "MariaDB"
     credentialsSecretRef: "mariadb-connection-secret" # The secret containing connection params

examples/topology/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system # Mandatory. Name of the state store
   namespace: default # Optional. Default namespace is "default"
 spec:
-  externalInvocation:
-    enabled: "true"
-    externalConnectorRef: invocation-connection-ref-secret
+  cluster:
+    features:
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: MySql
     credentialsSecretRef: mysql-connection-secret # The secret containing connection params

spawn_operator/spawn_operator/lib/spawn_operator/k8s/system/secret/actor_system_secret.ex

@@ -121,16 +121,18 @@ defmodule SpawnOperator.K8s.System.Secret.ActorSystemSecret do
   end
 
   defp maybe_use_nats_cluster(config, _name, namespace, params) do
-    nats_params = Map.get(params, "externalInvocation", %{})
-    enabled = Map.get(nats_params, "enabled", "false")
+    cluster_params = Map.get(params, "cluster", %{})
+    features = Map.get(cluster_params, "features", %{})
+    nats_params = Map.get(features, "nats", %{})
+    enabled = "#{Map.get(nats_params, "enabled", false)}"
 
     nats_config =
       case enabled do
         "false" ->
           %{}
 
         "true" ->
-          nats_secret_ref = Map.fetch!(nats_params, "externalConnectorRef")
+          nats_secret_ref = Map.fetch!(nats_params, "credentialsSecretRef")
 
           {:ok, secret} =
             K8s.Client.get("v1", :secret,
@@ -139,11 +141,11 @@ defmodule SpawnOperator.K8s.System.Secret.ActorSystemSecret do
             )
             |> then(&K8s.Client.run(conn(), &1))
 
-          secret_data = Map.fetch!(secret, "data")
-          nats_host_url = Map.fetch!(secret_data, "url")
+          secret_data = Map.get(secret, "data")
+          nats_host_url = Map.get(secret_data, "url", nats_params["url"])
           nats_auth = Map.get(secret_data, "authEnabled", "false")
-          nats_user = Map.fetch!(secret_data, "username")
-          nats_secret = Map.fetch!(secret_data, "password")
+          nats_user = Map.get(secret_data, "username")
+          nats_secret = Map.get(secret_data, "password")
           nats_tls = Map.get(secret_data, "tlsEnabled", "false")
 
           %{

spawnctl/.k8s/example/system.yaml

@@ -5,9 +5,11 @@ metadata:
   name: spawn-system
   namespace: default
 spec:
-  externalInvocation:
-    enabled: "false"
-    externalConnectorRef: invocation-connection-ref-secret
+  cluster:
+    features:
+      nats:
+        enabled: true
+        credentialsSecretRef: "nats-invocation-conn-secret" # 3. Nats broker credentials
   statestore:
     type: MySql
     credentialsSecretRef: mysql-connection-secret