Fix

nats-io · Sep 4, 2020 · 303b67d · 303b67d
1 parent a8fd64b
commit 303b67d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/pkg/apis/nats/v1alpha2/cluster.go b/pkg/apis/nats/v1alpha2/cluster.go
@@ -203,8 +203,9 @@ type RemoteGatewayOpts struct {
 
 // LeafNodeRemote is the URL for remote NATS system.
 type LeafNodeRemote struct {
-	URL         string `json:"url,omitempty"`
-	Credentials string `json:"credentials,omitempty"`
+	URL         string   `json:"url,omitempty"`
+	URLs        []string `json:"urls,omitempty"`
+	Credentials string   `json:"credentials,omitempty"`
 }
 
 // LeafNodeConfig is the configuration for leafnodes.

diff --git a/pkg/apis/nats/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/nats/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/conf/natsconf.go b/pkg/conf/natsconf.go
@@ -56,8 +56,8 @@ type GatewayConfig struct {
 
 // LeafNodeRemote is the URL for remote NATS system.
 type LeafNodeRemote struct {
-	URL         string `json:"url,omitempty"`
-	Credentials string `json:"credentials,omitempty"`
+	URLs        []string `json:"urls,omitempty"`
+	Credentials string   `json:"credentials,omitempty"`
 }
 
 type LeafNodeServerConfig struct {

diff --git a/pkg/util/kubernetes/kubernetes.go b/pkg/util/kubernetes/kubernetes.go
@@ -396,8 +396,16 @@ func addGatewayConfig(sconfig *natsconf.ServerConfig, cluster v1alpha2.ClusterSp
 			Port: cluster.LeafNodeConfig.Port,
 		}
 		for _, r := range cluster.LeafNodeConfig.Remotes {
+			var urls []string
+			if r.URL != "" {
+				urls = append(urls, r.URL)
+			}
+			if len(r.URLs) > 0 {
+				urls = append(urls, r.URLs...)
+			}
+
 			sconfig.LeafNode.Remotes = append(sconfig.LeafNode.Remotes, natsconf.LeafNodeRemote{
-				URL: r.URL,
+				URLs: urls,
 				Credentials: r.Credentials,
 			})
 		}