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

Remove vtunnel #7361

Merged
merged 7 commits into from
Aug 20, 2024
Merged

Remove vtunnel #7361

merged 7 commits into from
Aug 20, 2024

Conversation

Nino-K
Copy link
Member

@Nino-K Nino-K commented Aug 19, 2024

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

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>
Copy link
Contributor

@mook-as mook-as left a 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 :(

Comment on lines 793 to 794
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;
Copy link
Contributor

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)?

Comment on lines -827 to -828
const OldCredHelperService = '/etc/init.d/credhelper-vtunnel-peer';
const OldCredHelperConfd = '/etc/conf.d/credhelper-vtunnel-peer';
Copy link
Contributor

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)

Copy link
Member Author

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

Copy link
Contributor

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') {
Copy link
Contributor

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>
Copy link
Contributor

@mook-as mook-as left a 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).

@Nino-K Nino-K merged commit 12e8f84 into main Aug 20, 2024
28 checks passed
@Nino-K Nino-K deleted the remove-vtunnel branch August 20, 2024 23:14
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.

Remove Vtunnel
2 participants