Remove user name and password from consumer and stream types

nats-io · Jan 30, 2025 · eb33c85 · eb33c85
1 parent d1465a8
commit eb33c85
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/controllers/jetstream/controller.go b/controllers/jetstream/controller.go
@@ -549,13 +549,10 @@ func (c *Controller) getAccountOverrides(account string, ns string) (*accountOve
 }
 
 type jsmcSpecOverrides struct {
-	servers      []string
-	tls          apis.TLS
-	creds        string
-	nkey         string
-	userName     string
-	userPassword string
-	token        string
+	servers []string
+	tls     apis.TLS
+	creds   string
+	nkey    string
 }
 
 func (c *Controller) runWithJsmc(jsm jsmClientFunc, acc *accountOverrides, spec *jsmcSpecOverrides, o runtime.Object, op func(jsmClient) error) error {
@@ -580,12 +577,6 @@ func (c *Controller) runWithJsmc(jsm jsmClientFunc, acc *accountOverrides, spec
 		natsCtx.TLSCert = spec.tls.ClientCert
 		natsCtx.TLSKey = spec.tls.ClientKey
 	}
-	if spec.userName != "" && spec.userPassword != "" {
-		natsCtx.Username = spec.userName
-		natsCtx.Password = spec.userPassword
-	} else if spec.token != "" {
-		natsCtx.Token = spec.token
-	}
 
 	// Use fetched secrets for the account and server if defined.
 	if acc.remoteClientCert != "" && acc.remoteClientKey != "" {

diff --git a/deploy/crds.yml b/deploy/crds.yml
@@ -191,18 +191,6 @@ spec:
                 description: NATS user NKey for connecting to servers.
                 type: string
                 default: ''
-              userName:
-                description: NATS user name for connecting to servers.
-                type: string
-                default: ''
-              userPassword:
-                description: NATS user password for connecting to servers.
-                type: string
-                default: ''
-              token:
-                description: The token to be used to connect to the NATS Service.
-                type: string
-                default: ''
               tls:
                 description: A client's TLS certs and keys.
                 type: object
@@ -650,18 +638,6 @@ spec:
                 description: NATS user NKey for connecting to servers.
                 type: string
                 default: ''
-              userName:
-                description: NATS user name for connecting to servers.
-                type: string
-                default: ''
-              userPassword:
-                description: NATS user password for connecting to servers.
-                type: string
-                default: ''
-              token:
-                description: The token to be used to connect to the NATS Service.
-                type: string
-                default: ''
               account:
                 description: Name of the account to which the Consumer belongs.
                 type: string

diff --git a/pkg/jetstream/apis/jetstream/v1beta2/consumertypes.go b/pkg/jetstream/apis/jetstream/v1beta2/consumertypes.go
@@ -46,9 +46,6 @@ type ConsumerSpec struct {
 	MaxWaiting         int               `json:"maxWaiting"`
 	MemStorage         bool              `json:"memStorage"`
 	Nkey               string            `json:"nkey"`
-	UserName           string            `json:"userName"`
-	UserPassword       string            `json:"userPassword"`
-	Token              string            `json:"token"`
 	OptStartSeq        int               `json:"optStartSeq"`
 	OptStartTime       string            `json:"optStartTime"`
 	RateLimitBps       int               `json:"rateLimitBps"`

diff --git a/pkg/jetstream/apis/jetstream/v1beta2/streamtypes.go b/pkg/jetstream/apis/jetstream/v1beta2/streamtypes.go
@@ -43,9 +43,6 @@ type StreamSpec struct {
 	Mirror            *StreamSource     `json:"mirror"`
 	Name              string            `json:"name"`
 	Nkey              string            `json:"nkey"`
-	UserName          string            `json:"userName"`
-	UserPassword      string            `json:"userPassword"`
-	Token             string            `json:"token"`
 	NoAck             bool              `json:"noAck"`
 	Placement         *StreamPlacement  `json:"placement"`
 	Replicas          int               `json:"replicas"`