Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release 1.24] Revert "VPN integration" #7742

Merged
merged 1 commit into from
Jun 12, 2023

Conversation

manuelbuil
Copy link
Contributor

@manuelbuil manuelbuil commented Jun 12, 2023

This reverts commit 19f86eb.

Proposed Changes

Revert VPN integration in 1.24 because it requires using the latest flannel and unfortunately, latest flannel will not work well with 1.24. Newest flannel requires kubeapi 1.25 to support the multi-cidr feature.

Types of Changes

Bugfix

Verification

Testing

Linked Issues

#7747

User-Facing Change


Further Comments

@manuelbuil manuelbuil requested a review from a team as a code owner June 12, 2023 09:23
@manuelbuil manuelbuil changed the title Revert "VPN integration" [Release 1.24] Revert "VPN integration" Jun 12, 2023
This reverts commit 19f86eb.

Signed-off-by: Manuel Buil <mbuil@suse.com>
@codecov
Copy link

codecov bot commented Jun 12, 2023

Codecov Report

Patch coverage: 19.23% and project coverage change: +0.09 🎉

Comparison is base (71a47fb) 10.00% compared to head (cf4bbc2) 10.09%.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.24    #7742      +/-   ##
================================================
+ Coverage         10.00%   10.09%   +0.09%     
================================================
  Files               151      149       -2     
  Lines             10863    10746     -117     
================================================
- Hits               1087     1085       -2     
+ Misses             9552     9437     -115     
  Partials            224      224              
Flag Coverage Δ
unittests 10.09% <19.23%> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/agent/config/config.go 0.00% <ø> (ø)
pkg/agent/flannel/setup.go 0.00% <ø> (ø)
pkg/cli/agent/agent.go 0.00% <0.00%> (ø)
pkg/cli/cmds/agent.go 0.00% <ø> (ø)
pkg/cli/cmds/server.go 0.00% <ø> (ø)
pkg/cli/server/server.go 0.00% <0.00%> (ø)
pkg/cluster/encrypt.go 0.00% <0.00%> (ø)
pkg/daemons/config/types.go 67.21% <ø> (ø)
pkg/nodeconfig/nodeconfig.go 58.90% <ø> (-1.10%) ⬇️
pkg/passwd/passwd.go 60.81% <0.00%> (ø)
... and 3 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@manuelbuil manuelbuil merged commit d38189d into k3s-io:release-1.24 Jun 12, 2023
@manuelbuil manuelbuil deleted the revertVPN124 branch June 12, 2023 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants