reuse same name for client

johnweldon · Nov 13, 2023 · 0768570 · 0768570
1 parent 3f17554
commit 0768570
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/controllers/jetstream/consumer.go b/controllers/jetstream/consumer.go
@@ -132,7 +132,6 @@ func (c *Controller) processConsumerObject(cns *apis.Consumer, jsm jsmClientFunc
 		if c.opts.CRDConnect {
 			// Create a new client
 			natsCtx := &natsContext{}
-			natsCtx.Name = fmt.Sprintf("%s-con-%s-%d", c.opts.NATSClientName, spec.DurableName, cns.Generation)
 			// Use JWT/NKEYS based credentials if present.
 			if spec.Creds != "" {
 				natsCtx.Credentials = spec.Creds

diff --git a/controllers/jetstream/controller.go b/controllers/jetstream/controller.go
@@ -178,9 +178,9 @@ func (c *Controller) Run() error {
 
 	// Connect to NATS.
 	opts := make([]nats.Option, 0)
-	opts = append(opts, nats.Name(c.opts.NATSClientName))
 	// Always attempt to have a connection to NATS.
 	opts = append(opts, nats.MaxReconnects(-1))
+	natsCtxDefaults := &natsContextDefaults{Name: c.opts.NATSClientName}
 	if !c.opts.CRDConnect {
 		// Use JWT/NKEYS based credentials if present.
 		if c.opts.NATSCredentials != "" {
@@ -194,21 +194,23 @@ func (c *Controller) Run() error {
 		}
 
 		if c.opts.NATSCertificate != "" && c.opts.NATSKey != "" {
-			opts = append(opts, nats.ClientCert(c.opts.NATSCertificate, c.opts.NATSKey))
+			natsCtxDefaults.TLSCert = c.opts.NATSCertificate
+			natsCtxDefaults.TLSKey = c.opts.NATSKey
 		}
 
 		if c.opts.NATSCA != "" {
-			opts = append(opts, nats.RootCAs(c.opts.NATSCA))
+			natsCtxDefaults.TLSCAs = []string{c.opts.NATSCA}
 		}
-		ncp := newNatsConnPool(logrus.New(), &natsContextDefaults{URL: c.opts.NATSServerURL}, opts)
+		natsCtxDefaults.URL = c.opts.NATSServerURL
+		ncp := newNatsConnPool(logrus.New(), natsCtxDefaults, opts)
 		pooledNc, err := ncp.Get(&natsContext{})
 		if err != nil {
 			return fmt.Errorf("failed to connect to nats: %w", err)
 		}
 		pooledNc.ReturnToPool()
 		c.connPool = ncp
 	} else {
-		c.connPool = newNatsConnPool(logrus.New(), &natsContextDefaults{Name: c.opts.NATSClientName}, opts)
+		c.connPool = newNatsConnPool(logrus.New(), natsCtxDefaults, opts)
 	}
 
 	defer utilruntime.HandleCrash()

diff --git a/controllers/jetstream/stream.go b/controllers/jetstream/stream.go
@@ -147,7 +147,6 @@ func (c *Controller) processStreamObject(str *apis.Stream, jsm jsmClientFunc) (e
 		if c.opts.CRDConnect {
 			// Create a new client
 			natsCtx := &natsContext{}
-			natsCtx.Name = fmt.Sprintf("%s-str-%s-%d", c.opts.NATSClientName, spec.Name, str.Generation)
 			// Use JWT/NKEYS based credentials if present.
 			if spec.Creds != "" {
 				natsCtx.Credentials = spec.Creds