From 726fba5b7ff17a8e4a254166895b3a7aa58cc06c Mon Sep 17 00:00:00 2001
From: Joonas Bergius <joonas@cosmonic.com>
Date: Wed, 18 Sep 2024 21:07:40 -0500
Subject: [PATCH] chore: Revise the default NATS Server address logic

Signed-off-by: Joonas Bergius <joonas@cosmonic.com>
---
 .github/workflows/chart.yml           | 11 ++++++++---
 charts/wadm/Chart.yaml                |  2 +-
 charts/wadm/ci/ct-install-values.yaml |  4 ----
 charts/wadm/templates/_helpers.tpl    |  9 +++++++++
 charts/wadm/templates/deployment.yaml |  3 +--
 charts/wadm/values.yaml               |  2 +-
 6 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 charts/wadm/ci/ct-install-values.yaml

diff --git a/.github/workflows/chart.yml b/.github/workflows/chart.yml
index 6f750f9b..7bcefbca 100644
--- a/.github/workflows/chart.yml
+++ b/.github/workflows/chart.yml
@@ -2,6 +2,7 @@ name: chart
 
 env:
   HELM_VERSION: v3.14.0
+  CHART_TESTING_NAMESPACE: chart-testing
 
 on:
   push:
@@ -56,11 +57,15 @@ jobs:
         run: |
           helm repo add nats https://nats-io.github.io/k8s/helm/charts/
           helm repo update
-          helm install nats nats/nats -f charts/wadm/ci/nats.yaml
+          helm install nats nats/nats -f charts/wadm/ci/nats.yaml --namespace ${{ env.CHART_TESTING_NAMESPACE }} --create-namespace
 
-      - name: Run chart-testing (install)
+      - name: Run chart-testing install / same namespace
         run: |
-          ct install --config charts/wadm/ct.yaml
+          ct install --config charts/wadm/ct.yaml --namespace ${{ env.CHART_TESTING_NAMESPACE }}
+
+      - name: Run chart-testing install / across namespaces
+        run: |
+          ct install --config charts/wadm/ct.yaml --helm-extra-set-args "--set=wadm.config.nats.server=nats://nats-headless.${{ env.CHART_TESTING_NAMESPACE }}.svc.cluster.local"
 
   publish:
     if: ${{ startsWith(github.ref, 'refs/tags/chart-v') }}
diff --git a/charts/wadm/Chart.yaml b/charts/wadm/Chart.yaml
index 7f96d107..033cbeea 100644
--- a/charts/wadm/Chart.yaml
+++ b/charts/wadm/Chart.yaml
@@ -15,7 +15,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.6"
+version: "0.2.7"
 
 # 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/charts/wadm/ci/ct-install-values.yaml b/charts/wadm/ci/ct-install-values.yaml
deleted file mode 100644
index 120b9de0..00000000
--- a/charts/wadm/ci/ct-install-values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-wadm:
-  config:
-    nats:
-      server: "nats.default.svc.cluster.local:4222"
diff --git a/charts/wadm/templates/_helpers.tpl b/charts/wadm/templates/_helpers.tpl
index 13b2f792..0294c6b5 100644
--- a/charts/wadm/templates/_helpers.tpl
+++ b/charts/wadm/templates/_helpers.tpl
@@ -50,6 +50,15 @@ app.kubernetes.io/name: {{ include "wadm.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{- define "wadm.nats.server" -}}
+- name: WADM_NATS_SERVER
+{{- if .Values.wadm.config.nats.server }}
+  value: {{ .Values.wadm.config.nats.server | quote }}
+{{- else }}
+  value: nats-headless.{{ .Release.Namespace }}.svc.cluster.local
+{{- end }}
+{{- end }}
+
 {{- define "wadm.nats.auth" -}}
 {{- if  .Values.wadm.config.nats.creds.secretName -}}
 - name: WADM_NATS_CREDS_FILE
diff --git a/charts/wadm/templates/deployment.yaml b/charts/wadm/templates/deployment.yaml
index 522419f2..e0afe4ae 100644
--- a/charts/wadm/templates/deployment.yaml
+++ b/charts/wadm/templates/deployment.yaml
@@ -34,8 +34,7 @@ spec:
           image: "{{ .Values.wadm.image.repository }}:{{ .Values.wadm.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.wadm.image.pullPolicy }}
           env:
-            - name: WADM_NATS_SERVER
-              value: {{ .Values.wadm.config.nats.server | quote }}
+          {{- include "wadm.nats.server" . | nindent 12 }}
           {{- include "wadm.nats.auth" . | nindent 12 }}
           {{- if .Values.wadm.config.nats.tlsCaFile }}
             - name: WADM_NATS_TLS_CA_FILE
diff --git a/charts/wadm/values.yaml b/charts/wadm/values.yaml
index 23276bd8..9ed514cb 100644
--- a/charts/wadm/values.yaml
+++ b/charts/wadm/values.yaml
@@ -14,7 +14,7 @@ wadm:
     hostId: ""
     logLevel: ""
     nats:
-      server: "127.0.0.1:4222"
+      server: ""
       jetstreamDomain: ""
       tlsCaFile: ""
       creds: