diff --git a/CHANGELOG.md b/CHANGELOG.md index fc85110f..74ff95d1 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/cmd/zrok/testLoopPublic.go b/cmd/zrok/testLoopPublic.go index 6cfb381d..0b05c9bb 100644 --- a/cmd/zrok/testLoopPublic.go +++ b/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) diff --git a/endpoints/drive/backend.go b/endpoints/drive/backend.go index 57cfae5d..5e5a6202 100644 --- a/endpoints/drive/backend.go +++ b/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) diff --git a/endpoints/proxy/backend.go b/endpoints/proxy/backend.go index 24cd290b..1aef09e9 100644 --- a/endpoints/proxy/backend.go +++ b/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) diff --git a/endpoints/tcpTunnel/backend.go b/endpoints/tcpTunnel/backend.go index b7ba4027..b4274cbd 100644 --- a/endpoints/tcpTunnel/backend.go +++ b/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) diff --git a/endpoints/udpTunnel/backend.go b/endpoints/udpTunnel/backend.go index 0321b598..281cd26c 100644 --- a/endpoints/udpTunnel/backend.go +++ b/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) diff --git a/sdk/golang/sdk/listener.go b/sdk/golang/sdk/listener.go index 2fb8320c..0a41fcc5 100644 --- a/sdk/golang/sdk/listener.go +++ b/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) {