From d164342feb5cc1ba0cc49f1f8ceb3172dac1bbfe Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Fri, 13 Dec 2024 11:23:30 +0100 Subject: [PATCH] Prepare v2.21.0 Signed-off-by: Thomas Hallgren --- CHANGELOG.yml | 2 +- docs/release-notes.md | 2 +- docs/release-notes.mdx | 2 +- go.mod | 2 +- pkg/vif/testdata/router/go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.yml b/CHANGELOG.yml index e02ccc0e10..6f8ca824eb 100644 --- a/CHANGELOG.yml +++ b/CHANGELOG.yml @@ -34,7 +34,7 @@ docDescription: >- customizable development environments. items: - version: 2.21.0 - date: TBD + date: 2024-12-13 notes: - type: feature title: Automatic VPN conflict avoidance diff --git a/docs/release-notes.md b/docs/release-notes.md index bfdc3ae5ca..c1a5bed595 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,7 +1,7 @@ [comment]: # (Code generated by relnotesgen. DO NOT EDIT.) # Telepresence Release Notes -## Version 2.21.0 +## Version 2.21.0 (December 13) ##
feature
[Automatic VPN conflict avoidance](reference/vpn)
diff --git a/docs/release-notes.mdx b/docs/release-notes.mdx index 41753d413e..b30043e214 100644 --- a/docs/release-notes.mdx +++ b/docs/release-notes.mdx @@ -7,7 +7,7 @@ import { Note, Title, Body } from '@site/src/components/ReleaseNotes' [comment]: # (Code generated by relnotesgen. DO NOT EDIT.) # Telepresence Release Notes -## Version 2.21.0 +## Version 2.21.0 (December 13) Automatic VPN conflict avoidance Telepresence not only detects subnet conflicts between the cluster and workstation VPNs but also resolves them by performing network address translation to move conflicting subnets out of the way. diff --git a/go.mod b/go.mod index 6a5db48252..034b0a5ea4 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.10.0 github.com/telepresenceio/go-fuseftp/rpc v0.5.0 - github.com/telepresenceio/telepresence/rpc/v2 v2.21.0-rc.4 + github.com/telepresenceio/telepresence/rpc/v2 v2.21.0 github.com/vishvananda/netlink v1.3.0 golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d golang.org/x/net v0.32.0 diff --git a/pkg/vif/testdata/router/go.mod b/pkg/vif/testdata/router/go.mod index 5a3ec0039c..0ecb7574b6 100644 --- a/pkg/vif/testdata/router/go.mod +++ b/pkg/vif/testdata/router/go.mod @@ -51,7 +51,7 @@ require ( github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/telepresenceio/telepresence/rpc/v2 v2.21.0-rc.4 // indirect + github.com/telepresenceio/telepresence/rpc/v2 v2.21.0 // indirect github.com/vishvananda/netlink v1.3.0 // indirect github.com/vishvananda/netns v0.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect