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 pull request #937 from openziti/auto_rebase

Browse Source 
Auto-rebase (#936)
This commit is contained in:
Michael Quigley 2025-04-09 19:20:32 +00:00 committed by GitHub
commit b15c99f9cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## v1.0.2 ## v1.0.2
FEATURE: "Auto-rebase" for enabled environments where the `apiEndpoint` is set to `https://api.zrok.io`. This will automatically migrate existing environments to the new `apiEndpoint` for the `v1.0.x` series (https://github.com/openziti/zrok/issues/936)
FEATURE: New `admin/new_account_link` configuration option to allow the insertion of "how do I register for an account?" links into the login form (https://github.com/openziti/zrok/issues/552) FEATURE: New `admin/new_account_link` configuration option to allow the insertion of "how do I register for an account?" links into the login form (https://github.com/openziti/zrok/issues/552)
CHANGE: The release environment, share, and access modals in the API console now have a better message letting the user know they will still need to clean up their `zrok` processes (https://github.com/openziti/zrok/issues/910) CHANGE: The release environment, share, and access modals in the API console now have a better message letting the user know they will still need to clean up their `zrok` processes (https://github.com/openziti/zrok/issues/910)

9
environment/env_v0_4/root.go
View File

@ -6,8 +6,10 @@ import (
"github.com/openziti/zrok/environment/env_core" "github.com/openziti/zrok/environment/env_core"
"github.com/openziti/zrok/environment/env_v0_3" "github.com/openziti/zrok/environment/env_v0_3"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"os" "os"
"path/filepath" "path/filepath"
"strings"
) )
const V = "v0.4" const V = "v0.4"
@ -286,6 +288,13 @@ func loadEnvironment() (*env_core.Environment, error) {
ZitiIdentity: env.ZId, ZitiIdentity: env.ZId,
ApiEndpoint: env.ApiEndpoint, ApiEndpoint: env.ApiEndpoint,
} }
if strings.HasPrefix(env.ApiEndpoint, "https://api.zrok.io") {
out.ApiEndpoint = "https://api-v1.zrok.io"
if err := saveEnvironment(out); err != nil {
return nil, errors.Wrap(err, "error auto-rebasing apiEndpoint")
}
logrus.Info("auto-rebased 'apiEndpoint' for v1.0.x")
}
return out, nil return out, nil
} }