Merge branch 'main' into v0.4.0

CHANGELOG.md

@@ -8,6 +8,10 @@ CHANGE: The controller configuration version bumps from `v: 2` to `v: 3` to supp
 
 CHANGE: The underlying database store now utilizes a `deleted` flag on all tables to implement "soft deletes". This was necessary for the new metrics infrastructure, where we need to account for metrics data that arrived after the lifetime of a share or environment; and also we're going to need this for limits, where we need to see historical information about activity in the past (https://github.com/openziti/zrok/issues/262)
 
+# v0.3.6
+
+CHANGE: Additional change to support branch builds (for CI purposes) and additional containerization efforts around k8s.
+
 # v0.3.5
 
 CHANGE: `zrok config set apiEndpoint` now validates that the new API endpoint correctly starts with `http://` or `https://` (https://github.com/openziti/zrok/issues/258)

docker/images/zrok/Dockerfile

@@ -1,5 +1,5 @@
 # this builds docker.io/openziti/zrok
-FROM docker.io/openziti/ziti-cli:0.27.8
+FROM docker.io/openziti/ziti-cli:0.27.9
 # This build stage grabs artifacts that are copied into the final image.
 # It uses the same base as the final image to maximize docker cache hits.
 

docs/guides/self-hosting/self_hosting_guide.md

@@ -50,8 +50,10 @@ Create a controller configuration file in `etc/ctrl.yml`. The controller does no
 v:                  3
 
 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
   secrets:
-    -               f60b55fa-4dec-4c4a-9244-e3b7d6b9bb13
+    -               Q8V0LqnNb5wNX9kE1fgQ0H6VlcvJybB1
 
 endpoint:
   host:             0.0.0.0