Merge pull request #224 from fabriziosestito/refactor/remove-embedded-nats

refactor: remove the embedded NATS server

Author: fabriziosestito

cmd/controller/main.go

@@ -51,6 +51,7 @@ type Config struct {
 	EnableLeaderElection bool
 	SecureMetrics        bool
 	EnableHTTP2          bool
+	NatsURL              string
 	LogLevel             string
 }
 
@@ -66,6 +67,7 @@ func parseFlags() Config {
 		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
 	flag.BoolVar(&cfg.EnableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
+	flag.StringVar(&cfg.NatsURL, "nats-url", "localhost:4222", "The URL of the NATS server")
 	flag.StringVar(&cfg.LogLevel, "log-level", slog.LevelInfo.String(), "Log level")
 	flag.Parse()
 	return cfg
@@ -100,14 +102,7 @@ func main() {
 	ctrl.SetLogger(logger)
 	setupLog := logger.WithName("setup")
 
-	natsStorageDir := "/data/nats"
-	ns, err := messaging.NewServer(natsStorageDir)
-	if err != nil {
-		setupLog.Error(err, "unable to start NATS server")
-		os.Exit(1)
-	}
-
-	js, err := messaging.NewJetStreamContext(ns)
+	js, err := messaging.NewJetStreamContext(cfg.NatsURL)
 	if err != nil {
 		setupLog.Error(err, "unable to create JetStream context")
 		os.Exit(1)

helm/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: nats
+  repository: https://nats-io.github.io/k8s/helm/charts/
+  version: 1.3.7
+digest: sha256:8043b9037b1e01203912f54c20c1919fb3fe0a7503099b77fb0de2785559960a
+generated: "2025-05-29T16:30:48.470934699+02:00"

helm/Chart.yaml

@@ -22,3 +22,8 @@ version: 0.1.0-alpha1
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "0.1.0-alpha1"
+
+dependencies:
+  - name: nats
+    version: "1.3.7"
+    repository: "https://nats-io.github.io/k8s/helm/charts/"

helm/charts/nats-1.3.7.tgz

@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: {{ include "sbombastic.fullname" . }}-controller
   namespace: {{ .Release.Namespace }}
@@ -11,7 +11,6 @@ spec:
     matchLabels:
       {{ include "sbombastic.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: controller
-  serviceName: {{ include "sbombastic.fullname" . }}-controller
   replicas: {{ .Values.controller.replicas }}
   template:
     metadata:
@@ -25,6 +24,8 @@ spec:
           args:
             - -leader-elect
             - -health-probe-bind-address=:8081
+            - -nats-url
+            - {{ .Release.Name }}-nats.{{ .Release.Namespace }}.svc.cluster.local:4222
             {{- if .Values.controller.logLevel }}
             - -log-level={{ .Values.controller.logLevel }}
             {{- end }}
@@ -52,12 +53,5 @@ spec:
             requests:
               cpu: 10m
               memory: 64Mi
-          volumeMounts:
-            - name: nats-data
-              mountPath: /data/nats
-      volumes:
-        - name: nats-data
-          emptyDir: {}
       serviceAccountName: {{ include "sbombastic.fullname" . }}-controller
       terminationGracePeriodSeconds: 10
-

…lm/templates/controller/statefulset.yaml helm/templates/controller/deployment.yamlhelm/templates/controller/statefulset.yaml renamed to helm/templates/controller/deployment.yaml helm/templates/controller/statefulset.yaml renamed to helm/templates/controller/deployment.yaml

@@ -27,7 +27,7 @@ spec:
             {{ include "sbombastic.securityContext" . | nindent 12 }}
           args:
             - -nats-url
-            - {{ .Release.Name }}-controller-nats.{{ .Release.Namespace }}.svc.cluster.local:4222
+            - {{ .Release.Name }}-nats.{{ .Release.Namespace }}.svc.cluster.local:4222
             {{- if .Values.worker.logLevel }}
             - -log-level={{ .Values.worker.logLevel }}
             {{- end }}

helm/templates/controller/service.yaml

@@ -1,9 +1,8 @@
-suite: "Controller StatefulSet Tests"
+suite: "Controller Deployment Tests"
 templates:
-  - "templates/controller/statefulset.yaml"
-
+  - "templates/controller/deployment.yaml"
 tests:
-  - it: "should render a StatefulSet with the correct replica count, logging level, image, and imagePullPolicy"
+  - it: "should render a Deployment with the correct replica count, logging level, image, and imagePullPolicy"
     set:
       controller:
         replicas: 5
@@ -24,4 +23,4 @@ tests:
           value: "Always"
       - contains:
           path: "spec.template.spec.containers[0].args"
-          content: "-log-level=debug"
+          content: "-log-level=debug"

helm/templates/worker/deployment.yaml

@@ -26,6 +26,39 @@ worker:
   replicas: 3
   logLevel: "info"
 
+nats:
+  config:
+    cluster:
+      enabled: true
+    jetstream:
+      enabled: true
+  natsBox:
+    enabled: false
+  container:
+    merge:
+      securityContext:
+        readOnlyRootFilesystem: true
+        runAsNonRoot: true
+        runAsUser: 65532
+        seccompProfile:
+            type: RuntimeDefault
+        allowPrivilegeEscalation: false
+        capabilities:
+            drop:
+            - "ALL"
+  reloader:
+    merge:
+      securityContext:
+        readOnlyRootFilesystem: true
+        runAsNonRoot: true
+        runAsUser: 65532
+        seccompProfile:
+            type: RuntimeDefault
+        allowPrivilegeEscalation: false
+        capabilities:
+            drop:
+            - "ALL"
+
 persistence:
   enabled: true
 

…m/tests/controller/statefulset_test.yaml …lm/tests/controller/deployment_test.yamlhelm/tests/controller/statefulset_test.yaml renamed to helm/tests/controller/deployment_test.yaml helm/tests/controller/statefulset_test.yaml renamed to helm/tests/controller/deployment_test.yaml

@@ -4,35 +4,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/nats-io/nats-server/v2/server"
 	"github.com/nats-io/nats.go"
 )
 
 const sbombasticSubject = "sbombastic"
 
-func NewServer(storeDir string) (*server.Server, error) {
-	opts := &server.Options{
-		JetStream: true,
-		StoreDir:  storeDir,
-	}
-
-	ns, err := server.NewServer(opts)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create NATS server: %w", err)
-	}
-	ns.ConfigureLogger()
-
-	go ns.Start()
-
-	if !ns.ReadyForConnections(20 * time.Second) {
-		return nil, fmt.Errorf("NATS server not ready for connections: %w", err)
-	}
-
-	return ns, nil
-}
-
-func NewJetStreamContext(ns *server.Server) (nats.JetStreamContext, error) {
-	nc, err := nats.Connect(ns.ClientURL())
+func NewJetStreamContext(url string) (nats.JetStreamContext, error) {
+	nc, err := nats.Connect(url)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to NATS server: %w", err)
 	}