Merge branch 'release/v2.22.1' into release/v2

thallgren · thallgren · commit 884796610666 · 2025-03-27T05:31:58.000+01:00
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -86,6 +86,9 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build-release
+    outputs:
+      draft: ${{ steps.semver_check.outputs.draft }}
+      prerelease: ${{ steps.semver_check.outputs.prerelease }}
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -161,7 +164,7 @@ jobs:
     needs:
       - push-images
       - publish-release
-    if: ${{ needs.publish-release.semver_check.outputs.draft == 'false' }}
+    if: ${{ needs.publish-release.outputs.draft == 'false' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/CHANGELOG.yml b/CHANGELOG.yml
@@ -37,7 +37,7 @@ items:
           makes the `wiretap` completely read-only, there's no limit to how many simultaneous wiretaps that can be
           served. In fact, a `wiretap` and an `intercept` on the same port can run simultaneously.
   - version: 2.22.1
-    date: (TBD)
+    date: 2025-03-27
     notes:
       - type: bugfix
         title: Only restore inactive traffic-agent after a replace.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -9,7 +9,7 @@ The new `telepresence wiretap` command introduces a read-only form of an `interc
 Similar to an `ingest`, a `wiretap` will always enforce read-only status on all volume mounts, and since that makes the `wiretap` completely read-only, there's no limit to how many simultaneous wiretaps that can be served. In fact, a `wiretap` and an `intercept` on the same port can run simultaneously.
 </div>
 
-## Version 2.22.1
+## Version 2.22.1 <span style="font-size: 16px;">(March 27)</span>
 ## <div style="display:flex;"><img src="images/bugfix.png" alt="bugfix" style="width:30px;height:fit-content;"/><div style="display:flex;margin-left:7px;">Only restore inactive traffic-agent after a replace.</div></div>
 <div style="margin-left: 15px">
 
diff --git a/docs/release-notes.mdx b/docs/release-notes.mdx
@@ -15,7 +15,7 @@ The new `telepresence wiretap` command introduces a read-only form of an `interc
 Similar to an `ingest`, a `wiretap` will always enforce read-only status on all volume mounts, and since that makes the `wiretap` completely read-only, there's no limit to how many simultaneous wiretaps that can be served. In fact, a `wiretap` and an `intercept` on the same port can run simultaneously.
   </Body>
 </Note>
-## Version 2.22.1
+## Version 2.22.1 <span style={{fontSize:'16px'}}>(March 27)</span>
 <Note>
 	<Title type="bugfix">Only restore inactive traffic-agent after a replace.</Title>
 	<Body>
diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/telepresenceio/go-fuseftp v0.6.6
 	github.com/telepresenceio/go-fuseftp/rpc v0.6.6
-	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1-rc.0
+	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1
 	github.com/vishvananda/netlink v1.3.0
 	golang.org/x/net v0.37.0
 	golang.org/x/sys v0.31.0
diff --git 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.14.1 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1-rc.0 // indirect
+	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1 // 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

-Original file line number
+Diff line change
 	github.com/stretchr/testify v1.10.0
 	github.com/telepresenceio/go-fuseftp v0.6.6
 	github.com/telepresenceio/go-fuseftp/rpc v0.6.6
 -	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1-rc.0
 +	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1
 	github.com/vishvananda/netlink v1.3.0
 	golang.org/x/net v0.37.0
 	golang.org/x/sys v0.31.0
-Original file line number
+Diff line change
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 -	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1-rc.0 // indirect
 +	github.com/telepresenceio/telepresence/rpc/v2 v2.22.1 // 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