extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-20 01:37:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into frontends_resource_count

Browse Source
This commit is contained in:
Michael Quigley 2024-06-18 10:48:05 -04:00
commit 7f4b8afab3
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
FEATURE: Resource count limits now include `share_frontends` to limit the number of frontends that are allowed to make connections to a share (https://github.com/openziti/zrok/issues/650) FEATURE: Resource count limits now include `share_frontends` to limit the number of frontends that are allowed to make connections to a share (https://github.com/openziti/zrok/issues/650)
FIX: use controller config spec v4 in the Docker instance
## v0.4.31 ## v0.4.31
FEATURE: New "limits classes" limits implementation (https://github.com/openziti/zrok/issues/606). This new feature allows for extensive limits customization on a per-user basis, with fallback to the global defaults in the controller configuration. FEATURE: New "limits classes" limits implementation (https://github.com/openziti/zrok/issues/606). This new feature allows for extensive limits customization on a per-user basis, with fallback to the global defaults in the controller configuration.

4
docker/compose/zrok-instance/README.md
View File

@ -90,9 +90,9 @@ ZROK_OAUTH_GOOGLE_CLIENT_ID=abcd1234
ZROK_OAUTH_GOOGLE_CLIENT_SECRET=abcd1234 ZROK_OAUTH_GOOGLE_CLIENT_SECRET=abcd1234
# zrok version, e.g., 1.0.0 # zrok version, e.g., 1.0.0
ZROK_IMAGE_TAG=latest ZROK_CLI_TAG=latest
# ziti version, e.g., 1.0.0 # ziti version, e.g., 1.0.0
ZITI_IMAGE_TAG=latest ZITI_CLI_TAG=latest
``` ```
### Start the Docker Compose Project ### Start the Docker Compose Project

2
docker/compose/zrok-instance/zrok-controller-config.yml.envsubst
View File

@ -4,7 +4,7 @@
# /___|_| \___/|_|\_\ # /___|_| \___/|_|\_\
# controller configuration # controller configuration
v: 3 v: 4
admin: admin:
# generate these admin tokens from a source of randomness, e.g. # generate these admin tokens from a source of randomness, e.g.
# LC_ALL=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c32 # LC_ALL=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c32