From 0c465706cc69042e80ac988ebc303a3d94cd2272 Mon Sep 17 00:00:00 2001 From: Jim Date: Sat, 20 May 2023 05:48:14 -0400 Subject: [PATCH] chore: increment base version to 0.13.0 --- internal/daemon/controller/listeners_test.go | 8 ++++++++ version/version_base.go | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/daemon/controller/listeners_test.go b/internal/daemon/controller/listeners_test.go index b11781c7a..9c0d4e0c3 100644 --- a/internal/daemon/controller/listeners_test.go +++ b/internal/daemon/controller/listeners_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/version" "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-secure-stdlib/configutil/v2" "github.com/hashicorp/go-secure-stdlib/listenerutil" @@ -802,10 +803,17 @@ func clusterTestDialer(t *testing.T, c *Controller, network string) func(context nonce, err := base62.Random(20) require.NoError(t, err) + // after 0.13.0 we need to include the version that matches between the + // controller and the worker otherwise worker tls auth with fail + v := version.Get().Version + if version.Get().VersionMetadata != "" { + v += "+" + version.Get().VersionMetadata + } info := base.WorkerAuthInfo{ CertPEM: pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certBytes}), KeyPEM: pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: marshaledKey}), ConnectionNonce: nonce, + BoundaryVersion: v, } infoBytes, err := json.Marshal(info) require.NoError(t, err) diff --git a/version/version_base.go b/version/version_base.go index de7338eda..c594610cc 100644 --- a/version/version_base.go +++ b/version/version_base.go @@ -13,7 +13,7 @@ var ( // Version is the base version // Default values - set when building locally (at build time) - Version = "0.12.2" + Version = "0.13.0" // VersionPrerelease is also set at compile time, similarly to Version. VersionPrerelease string