From 39340202650a78022d4c9664bb2ecd215e0f2e39 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 9 Jul 2024 11:37:29 -0400 Subject: [PATCH 1/2] fix for broken environment count inheritance (#695) --- controller/limits/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/limits/agent.go b/controller/limits/agent.go index af19aa2e..4bcf251d 100644 --- a/controller/limits/agent.go +++ b/controller/limits/agent.go @@ -68,7 +68,7 @@ func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) { if err != nil { return false, err } - if len(envs)+1 > a.cfg.Environments { + if len(envs)+1 > ul.resource.GetEnvironments() { return false, nil } } From c0fac3418589ace6f90829b4413644450eb4aac6 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 9 Jul 2024 11:38:29 -0400 Subject: [PATCH 2/2] changelog (#695) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da06f3a8..0625d404 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ CHANGE: auto-update the ziti CLI version that is built in to the openziti/zrok c CHANGE: Docker examples set HOME to enable running CLI commands in the container +FIX: Fix for environment count inheritance when using a resource count class to override global environment count (https://github.com/openziti/zrok/issues/695) + ## v0.4.34 FEATURE: Linux service support for all private share modes (contribution from Stefan Adelbert @stefanadelbert)