Skip to content

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Sep 28, 2025

Skip the host version v0-v2 migration code and os provisioners.
Also skip all the version handling, for downloading boot2docker.

Only copy the hyperv and virtualbox drivers actually being used.

  • Import github.com/Parallels/docker-machine-parallels/v2
    Drop the "version" since it is not needed anymore.

  • Import github.com/machine-drivers/docker-machine-driver-vmware
    Drop the "config" subdirectory from the module path.

This PR goes well with dropping hyperkit and internalizing kvm:


Issue #21619

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 28, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: afbjorklund
Once this PR has been reviewed and has the lgtm label, please assign comradeprogrammer for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 28, 2025
Skip the host version v0-v2 migration code and os provisioners.
Also skip all the version handling, for downloading boot2docker.

Only copy the hyperv and virtualbox drivers actually being used.
There is an "errdriver" that is only used for internal testing.

Import github.com/Parallels/docker-machine-parallels/v2
Import github.com/machine-drivers/docker-machine-driver-vmware
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@afbjorklund are we leaving out the vmware and parellles drivers ? if yes, could we import them too ?

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Sep 30, 2025

are we leaving out the vmware and parellles drivers ?

In this PR, they are included (with their original LICENSE)

But in order to test them, you would probably need to get some CI licenses from the vendor?

Only the machine drivers are included, not the actual hypervisor and their control programs...

@medyagh
Copy link
Member

medyagh commented Oct 1, 2025

@afbjorklund we would need to fix the licenses, maybe we can slap our own boilerplate on the top of the file ? could a file have two linceses ?

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Oct 1, 2025

Parallells might be harder, since it is using a different license (MIT, rather than Apache-2.0)

Copyright (c) 2015-2020 Parallels IP Holdings GmbH.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

But you already have all of this under vendor, so it is only a question of reporting (or not)

vendor/github.com/Parallels/docker-machine-parallels/v2/LICENSE

vendor/github.com/machine-drivers/docker-machine-driver-vmware/LICENSE

We could do something similar:

/*
Copyright 2017 The Kubernetes Authors All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

/*
 * Copyright 2017 VMware, Inc.  All rights reserved.  Licensed under the Apache v2 License.
 */

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Oct 1, 2025

https://opensource.stackexchange.com/questions/7384/proper-way-of-migrating-mit-licensed-code-to-apache-2-0-license

When the project is under both the MIT and Apache license, then it is sufficient to call your project Apache 2 licensed: the terms of the Apache license are a superset of the MIT license terms. However, you still have to keep any existing MIT license notices intact.

Copyright (c) 2015-2020 Parallels IP Holdings GmbH.

Same for the Apache license notices:

Copyright 2017 VMware, Inc. All rights reserved.
Copyright 2014 Docker, Inc.

@k8s-ci-robot
Copy link
Contributor

@afbjorklund: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-minikube-integration 3eafd42 link true /test pull-minikube-integration

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants