From 69722432787ef9364c7e2a0d7c16269629cd7d25 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 15 Jun 2024 16:37:42 -0400 Subject: [PATCH 1/3] Update README.md Signed-off-by: Kenneth Bingham --- docker/compose/zrok-instance/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/compose/zrok-instance/README.md b/docker/compose/zrok-instance/README.md index 1cdf2b02..8d56d167 100644 --- a/docker/compose/zrok-instance/README.md +++ b/docker/compose/zrok-instance/README.md @@ -90,9 +90,9 @@ ZROK_OAUTH_GOOGLE_CLIENT_ID=abcd1234 ZROK_OAUTH_GOOGLE_CLIENT_SECRET=abcd1234 # zrok version, e.g., 1.0.0 -ZROK_IMAGE_TAG=latest +ZROK_CLI_TAG=latest # ziti version, e.g., 1.0.0 -ZITI_IMAGE_TAG=latest +ZITI_CLI_TAG=latest ``` ### Start the Docker Compose Project From 9a55043a81905f1f08158b59a661bb3789f398ae Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 15 Jun 2024 16:50:00 -0400 Subject: [PATCH 2/3] Update zrok-controller-config.yml.envsubst Set spec v4 Re: https://github.com/openziti/zrok/issues/653 Signed-off-by: Kenneth Bingham --- .../compose/zrok-instance/zrok-controller-config.yml.envsubst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst b/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst index 389f4bce..cbdfe639 100644 --- a/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst +++ b/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst @@ -4,7 +4,7 @@ # /___|_| \___/|_|\_\ # controller configuration -v: 3 +v: 4 admin: # 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 From 7f597ab71431e39ae039604a17315624877304a4 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 15 Jun 2024 16:54:01 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md Signed-off-by: Kenneth Bingham --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c98abd8c..d8325861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.4.32 + +FIX: use controller config spec v4 in the Docker instance + ## 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.