[helm nats 1.x] config.serverNamePrefix option

Signed-off-by: Caleb Lloyd <caleb@synadia.com>
nats-io · Jun 13, 2023 · 2574eec · 2574eec
1 parent 6d410e2
commit 2574eec
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/helm/charts/nats/Chart.yaml b/helm/charts/nats/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - nats
 - messaging
 - cncf
-version: 1.0.0-beta.5
+version: 1.0.0-beta.6
 home: http://github.com/nats-io/k8s
 maintainers:
 - email: info@nats.io

diff --git a/helm/charts/nats/files/config/config.yaml b/helm/charts/nats/files/config/config.yaml
@@ -1,7 +1,7 @@
 {{- $pidFile := ternary "/var/run/nats/nats.pid" "/var/run/nats.pid" .Values.reloader.enabled }}
 {{- with .Values.config }}
 
-server_name: << $POD_NAME >>
+server_name: << $SERVER_NAME >>
 lame_duck_grace_period: 10s
 lame_duck_duration: 30s
 pid_file: {{ $pidFile }}

diff --git a/helm/charts/nats/files/stateful-set/beta2-mount-fix-container.yaml b/helm/charts/nats/files/stateful-set/beta2-mount-fix-container.yaml
diff --git a/helm/charts/nats/files/stateful-set/nats-container.yaml b/helm/charts/nats/files/stateful-set/nats-container.yaml
@@ -20,6 +20,8 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.name
+- name: SERVER_NAME
+  value: {{ printf "%s$(POD_NAME)" .Values.config.serverNamePrefix | quote }}
 {{- with .Values.container.env }}
 {{- include "nats.env" . }}
 {{- end }}

diff --git a/helm/charts/nats/test/chart_test.go b/helm/charts/nats/test/chart_test.go
@@ -202,6 +202,7 @@ func HelmRender(t *testing.T, test *Test) *Resources {
 	}
 
 	_ = os.Setenv("POD_NAME", "nats-0")
+	_ = os.Setenv("SERVER_NAME", "nats-0")
 	resources.Conf.Value, err = conf.ParseFile(filepath.Join(confDir, "nats.conf"))
 	require.NoError(t, err)
 	resources.Conf.HasValue = true

diff --git a/helm/charts/nats/test/config_test.go b/helm/charts/nats/test/config_test.go
@@ -150,6 +150,7 @@ config:
     pvc:
       size: 5Gi
       storageClassName: gp3
+  serverNamePrefix: test_
 `
 	expected := DefaultResources(t, test)
 
@@ -211,16 +212,18 @@ config:
 		},
 	}
 
-	vm := expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].VolumeMounts
-	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].VolumeMounts = append(vm, corev1.VolumeMount{
+	ctr := &expected.StatefulSet.Value.Spec.Template.Spec.Containers[0]
+	ctr.Env[1].Value = "test_$(POD_NAME)"
+
+	ctr.VolumeMounts = append(ctr.VolumeMounts, corev1.VolumeMount{
 		MountPath: "/mnt",
 		Name:      test.FullName + "-js",
 	}, corev1.VolumeMount{
 		MountPath: "/mnt/resolver",
 		Name:      test.FullName + "-resolver",
 	})
 
-	expected.StatefulSet.Value.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
+	ctr.Ports = []corev1.ContainerPort{
 		{
 			Name:          "nats",
 			ContainerPort: 4222,

diff --git a/helm/charts/nats/test/defaults_test.go b/helm/charts/nats/test/defaults_test.go
@@ -407,6 +407,10 @@ exec sh -ec "$0"
 												},
 											},
 										},
+										{
+											Name: "SERVER_NAME",
+											Value: "$(POD_NAME)",
+										},
 									},
 									Image: dd.NatsImage,
 									Lifecycle: &corev1.Lifecycle{

diff --git a/helm/charts/nats/values.yaml b/helm/charts/nats/values.yaml
@@ -233,6 +233,10 @@ config:
     merge: {}
     patch: []
 
+  # adds a prefix to the server name, which defaults to the pod name
+  # helpful for ensuring server name is unique in a super cluster
+  serverNamePrefix: ""
+
   # merge or patch the nats config
   # https://docs.nats.io/running-a-nats-service/configuration
   # following special rules apply