Merge pull request #1720 from openziti/release-next

Release 0.32.1

ADOPTERS.md

@@ -42,3 +42,4 @@ Here's the list of projects which are proudly adopting and using OpenZiti
 | GIGO Dev                         | https://gigo.dev/                             | <img src="https://gigo.dev/logo192.png" width="100px"> | GIGO Dev is a learn-to-code platform that focuses on aligning learning with the real world of development. On GIGO you work in DevSpaces (Cloud Development Environments) capable of running nearly any system configuration needed for the challenge. We use OpenZiti to dynamically and securely expose network applications inside your DevSpace. Ziti provides the simplest, easiest, and most reliable system to securely route traffic into the local network of your DevSpace. |
 | Underground Nexus                | https://github.com/Underground-Ops/underground-nexus                             | <img src="https://raw.githubusercontent.com/Underground-Ops/underground-nexus/18d63a02aad41d8f540a044d5dd47f025d2b61a1/Graphics/SVG/cloud-underground-logo.svg" width="100px"> | Cloud Underground has chosen OpenZiti to integrate with our project called the Underground Nexus. OpenZiti provides our project with a unique way to maintain Zero Trust networking using it's overlay system to produce networks that don't require applications to be exposed to the public web - without the use of a VPN. |
 | Ubitech                          | https://ubitech.eu/                           | <img src="https://ubitech.eu/wp-content/uploads/logo.png" width="100px"> | UBITECH develops Maestro, an end-to-end service orchestrator, which allows for seamless deployment and management of services across geo-distributed and heterogeneous domains (including 5G). Maestro uses OpenZiti as a programmable integration fabric to enable connectivity in multi-domain and multi-tenant scenarios. |
+| OSMIT GmbH                       | https://osmit.de/                             | <img src="https://www.osmit.de/images/logo.svg" width="100px"> | OSMIT provides services for medium and large companies in the DACH region. We leverage the Zero Trust approach OpenZiti gives us to deliver our services in a secure manner to comply with data protection and privacy regulations (GDPR). |

CHANGELOG.md

@@ -1,3 +1,35 @@
+# Release 0.32.1
+
+## What's New
+
+* Bugfixes
+* New router setting to control startup timeout
+
+## Router startup timeout
+
+The router now has a configuration setting to control how long it wait on startup to be able to 
+connect to a controller, before it gives up and exits.
+
+```
+ctrl:
+  endpoints: 
+    - tls:localhost:1280
+  startupTimeout: 5m 
+```
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/channel/v2: [v2.0.116 -> v2.0.117](https://github.com/openziti/channel/compare/v2.0.116...v2.0.117)
+    * [Issue #125](https://github.com/openziti/channel/issues/125) - Ensure reconnecting channel is marked as connected before calling reconnect callback
+
+* github.com/openziti/edge-api: [v0.26.8 -> v0.26.10](https://github.com/openziti/edge-api/compare/v0.26.8...v0.26.10)
+* github.com/openziti/sdk-golang: [v0.22.17 -> v0.22.21](https://github.com/openziti/sdk-golang/compare/v0.22.17...v0.22.21)
+* github.com/openziti/ziti: [v0.32.0 -> v0.32.1](https://github.com/openziti/ziti/compare/v0.32.0...v0.32.1)
+    * [Issue #1709](https://github.com/openziti/ziti/issues/1709) - Fix link management race conditions found by chaos testing
+    * [Issue #1715](https://github.com/openziti/ziti/issues/1715) - Ensure controller raft peers don't end up with duplicate connections 
+    * [Issue #1702](https://github.com/openziti/ziti/issues/1702) - Add link management chaos test
+    * [Issue #1691](https://github.com/openziti/ziti/issues/1691) multiple er re-enrolls creates multiple enrollments
+
 # Release 0.32.0
 
 ## What's New

common/getziti/github.go

@@ -119,7 +119,7 @@ func GetLatestGitHubReleaseAsset(appName string, appGitHub string, version strin
 			version = strings.TrimPrefix(version, "v")
 		}
 
-		if appName == "ziti" || appName == "ziti-edge-tunnel" {
+		if appName == "ziti" || appName == "ziti-edge-tunnel" || appName == "zrok" {
 			if !strings.HasPrefix(version, "v") {
 				version = "v" + version
 			}
@@ -282,6 +282,29 @@ func InstallGitHubRelease(zitiApp string, release *GitHubReleasesData, binDir st
 				return errors.Errorf("didn't find ziti executable in release archive. count: %v", count)
 			}
 
+			pfxlog.Logger().Infof("Successfully installed '%s' version '%s' to %s", zitiApp, release.Version, filepath.Join(binDir, zitiFileName))
+			return nil
+		} else if zitiApp == c.ZROK {
+			count := 0
+			zitiFileName := "zrok-" + version
+			expectedPath := "zrok"
+
+			err = UnTarGz(fullPath, binDir, func(path string) (string, bool) {
+				if path == expectedPath {
+					count++
+					return zitiFileName, true
+				}
+				return "", false
+			})
+
+			if err != nil {
+				return err
+			}
+
+			if count != 1 {
+				return errors.Errorf("didn't find zrok executable in release archive. count: %v", count)
+			}
+
 			pfxlog.Logger().Infof("Successfully installed '%s' version '%s' to %s", zitiApp, release.Version, filepath.Join(binDir, zitiFileName))
 			return nil
 		} else {

common/getziti/install_ziti.go

@@ -10,3 +10,9 @@ func InstallZiti(targetVersion, targetOS, targetArch, binDir string, verbose boo
 	return FindVersionAndInstallGitHubRelease(
 		c.ZITI, c.ZITI, targetOS, targetArch, binDir, targetVersion, verbose)
 }
+
+func InstallZrok(targetVersion, targetOS, targetArch, binDir string, verbose bool) error {
+	fmt.Println("Attempting to install '" + c.ZROK + "' version: " + targetVersion)
+	return FindVersionAndInstallGitHubRelease(
+		c.ZROK, c.ZROK, targetOS, targetArch, binDir, targetVersion, verbose)
+}

common/inspect/links_inspect_result.go

@@ -47,17 +47,18 @@ type LinkDest struct {
 }
 
 type LinkState struct {
-	Id             string   `json:"id"`
-	Key            string   `json:"key"`
-	Status         string   `json:"status"`
-	DialAttempts   uint64   `json:"dialAttempts"`
-	ConnectedCount uint64   `json:"connectedCount"`
-	RetryDelay     string   `json:"retryDelay"`
-	NextDial       string   `json:"nextDial"`
-	TargetAddress  string   `json:"targetAddress"`
-	TargetGroups   []string `json:"targetGroups"`
-	TargetBinding  string   `json:"targetBinding"`
-	DialerGroups   []string `json:"dialerGroups"`
-	DialerBinding  string   `json:"dialerBinding"`
-	CtrlsNotified  bool     `json:"ctrlsNotified"`
+	Id                string   `json:"id"`
+	Key               string   `json:"key"`
+	Status            string   `json:"status"`
+	DialAttempts      uint64   `json:"dialAttempts"`
+	ConnectedCount    uint64   `json:"connectedCount"`
+	RetryDelay        string   `json:"retryDelay"`
+	NextDial          string   `json:"nextDial"`
+	TargetAddress     string   `json:"targetAddress"`
+	TargetGroups      []string `json:"targetGroups"`
+	TargetBinding     string   `json:"targetBinding"`
+	DialerGroups      []string `json:"dialerGroups"`
+	DialerBinding     string   `json:"dialerBinding"`
+	CtrlsNotified     bool     `json:"ctrlsNotified"`
+	EstablishedLinkId string   `json:"establishedLinkId"`
 }