Merge pull request #536 from openziti/max_terminators

Set Maximum Terminators to Default (#535)

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 CHANGE: Improved OpenZiti resource cleanup resilience. Previous resource cleanup would stop when an error was encountered at any stage of the cleanup process (serps, sps, config, service). New cleanup implementation logs errors but continues to clean up anything that it can (https://github.com/openziti/zrok/issues/533)
 
+CHANGE: Instead of setting the `ListenOptions.MaxConnections` property to `64`, use the default value of `3`. This property actually controls the number of terminators created on the underlying OpenZiti network. This property is actually getting renamed to `ListenOptions.MaxTerminators` in an upcoming release of `github.com/openziti/sdk-golang` (https://github.com/openziti/zrok/issues/535)
+
 ## v0.4.22
 
 FIX: The goreleaser action is not updated to work with the latest golang build. Modifed `go.mod` to comply with what goreleaser expects

cmd/zrok/testLoopPublic.go

@@ -151,7 +151,6 @@ func (l *looper) serviceListener() {
 	}
 	options := ziti.ListenOptions{
 		ConnectTimeout:               5 * time.Minute,
-		MaxConnections:               64,
 		WaitForNEstablishedListeners: 1,
 	}
 	zctx, err := ziti.NewContext(zcfg)

endpoints/drive/backend.go

@@ -27,7 +27,6 @@ type Backend struct {
 func NewBackend(cfg *BackendConfig) (*Backend, error) {
 	options := ziti.ListenOptions{
 		ConnectTimeout:               5 * time.Minute,
-		MaxConnections:               64,
 		WaitForNEstablishedListeners: 1,
 	}
 	zcfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)

endpoints/proxy/backend.go

@@ -32,7 +32,6 @@ type Backend struct {
 func NewBackend(cfg *BackendConfig) (*Backend, error) {
 	options := ziti.ListenOptions{
 		ConnectTimeout:               5 * time.Minute,
-		MaxConnections:               64,
 		WaitForNEstablishedListeners: 1,
 	}
 	zcfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)

endpoints/tcpTunnel/backend.go

@@ -25,7 +25,6 @@ type Backend struct {
 func NewBackend(cfg *BackendConfig) (*Backend, error) {
 	options := ziti.ListenOptions{
 		ConnectTimeout:               5 * time.Minute,
-		MaxConnections:               64,
 		WaitForNEstablishedListeners: 1,
 	}
 	zcfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)

endpoints/udpTunnel/backend.go

@@ -25,7 +25,6 @@ type Backend struct {
 func NewBackend(cfg *BackendConfig) (*Backend, error) {
 	options := ziti.ListenOptions{
 		ConnectTimeout:               5 * time.Minute,
-		MaxConnections:               64,
 		WaitForNEstablishedListeners: 1,
 	}
 	zcfg, err := ziti.NewConfigFromFile(cfg.IdentityPath)

sdk/golang/sdk/listener.go

@@ -9,7 +9,10 @@ import (
 )
 
 func NewListener(shrToken string, root env_core.Root) (edge.Listener, error) {
-	return NewListenerWithOptions(shrToken, root, &ziti.ListenOptions{ConnectTimeout: 30 * time.Second, MaxConnections: 64, WaitForNEstablishedListeners: 1})
+	return NewListenerWithOptions(shrToken, root, &ziti.ListenOptions{
+		ConnectTimeout:               30 * time.Second,
+		WaitForNEstablishedListeners: 1,
+	})
 }
 
 func NewListenerWithOptions(shrToken string, root env_core.Root, opts *ziti.ListenOptions) (edge.Listener, error) {