-
Notifications
You must be signed in to change notification settings - Fork 285
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
Remove vtunnel #7361
Remove vtunnel #7361
Conversation
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should at least remove /etc/init.d/vtunnel-peer
.
Also, spell checking is still unhappy :(
pkg/rancher-desktop/backend/wsl.ts
Outdated
const credentialServerAddr = '192.168.127.254:6109'; | ||
// When networkTunnel is enabled we talk directly to the host which is assigned | ||
// with 192.168.127.254 static address. Otherwise, we talk to the vtunnel peer | ||
// which is listening in the WSL VM on 127.0.0.1:3030. | ||
const credForwarderURL = this.cfg?.experimental.virtualMachine.networkingTunnel ? credentialServerAddr : vtunnelPeerServerAddr; | ||
const credForwarderURL = credentialServerAddr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need both variables (that have the same value)?
const OldCredHelperService = '/etc/init.d/credhelper-vtunnel-peer'; | ||
const OldCredHelperConfd = '/etc/conf.d/credhelper-vtunnel-peer'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to delete any existing copies of the old services? (Including /etc/init.d/vtunnel-peer
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I already deleted it under assets/scripts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I should have been clearer: when a user upgrades from an older version of Rancher Desktop, wouldn't the existing files be left behind? Do we need to delete those?
(This would be the same reason we had migrations like this before)
|
||
// The peerPort and upstreamServerAddress port will need to match | ||
// this is crucial if we ever pick dynamic ports for upstreamServerAddress | ||
if (process.platform === 'win32') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, just realized that running rdctl
from WSL (non-RD distro) doesn't work; should we file that as a bug? Old network would have worked (because of this line).
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
Signed-off-by: Nino Kodabande <nkodabande@suse.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable, and tests seem to pass (on the previous run). Please merge after all tests are done (not just the required ones; so not using the auto-merge checkbox).
Removes references to vtunnel out of the main repo.
Note: there are still some vtunnel references in docs, however, those will be removed once the other projects are updated, e.g. guest agent.
Fixes: #7362