From 8ccdbb784d528d6d775ea4f2e021630d3911c6b2 Mon Sep 17 00:00:00 2001
From: Dan Norris <protochron@users.noreply.github.com>
Date: Mon, 27 May 2024 14:33:49 -0400
Subject: [PATCH] fix: allow nats address to include a port

This fix omits the preset NATS leaf node port `7422` from being
automatically set if the `natsAddress` field is set in the CRD. This
allows you to specify the port if it is not using the default at the
cost of making it required.

Signed-off-by: Dan Norris <protochron@users.noreply.github.com>
---
 hack/run-kind-cluster.sh | 2 +-
 sample.yaml              | 8 ++++----
 src/controller.rs        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hack/run-kind-cluster.sh b/hack/run-kind-cluster.sh
index 6d6ded8..515aa30 100755
--- a/hack/run-kind-cluster.sh
+++ b/hack/run-kind-cluster.sh
@@ -18,7 +18,7 @@ fi
 # https://github.com/kubernetes-sigs/kind/issues/2875
 # https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
 # See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
-cat <<EOF | kind create cluster --image kindest/node:v1.29.2 --config=-
+cat <<EOF | kind create cluster --image kindest/node:v1.29.4 --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches:
diff --git a/sample.yaml b/sample.yaml
index b59f1e1..2e2bafc 100644
--- a/sample.yaml
+++ b/sample.yaml
@@ -17,7 +17,7 @@ spec:
   # The name of a secret in the same namespace that provides the required secrets.
   secretName: cluster-secrets
   logLevel: INFO
-  natsAddress: nats://nats-cluster.default.svc.cluster.local
+  natsAddress: nats://nats-cluster.default.svc.cluster.local:7422
   ################################################
   # Additional options that can be set for hosts:
   ################################################
@@ -27,9 +27,9 @@ spec:
   #   - "kind-registry:5000"
   # Policy service configuration
   # policyService:
-  #   topic: "wasmcloud.policy"
-  #   #changesTopic: "bar"
-  #   timeoutMs: 10000
+  #  topic: "wasmcloud.policy"
+  #  changesTopic: "bar"
+  #  timeoutMs: 10000
   # Additional options to control how the underlying wasmCloud hosts are scheduled in Kubernetes.
   # This includes setting resource requirements for the nats and wasmCloud host
   # containers along with any additional pot template settings.
diff --git a/src/controller.rs b/src/controller.rs
index cfd5b00..d2f1e9f 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -835,7 +835,7 @@ jetstream {
 leafnodes {
   remotes: [
     {
-      url: "{{cluster_url}}:7422"
+      url: "{{cluster_url}}"
       {{#if use_credentials}}
       credentials: "/nats/nats.creds"
       {{/if}}