-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Internalize vendor/github.com/docker/machine #21647
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
base: master
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: afbjorklund 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 |
37ce4f6
to
6ae4e88
Compare
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
6ae4e88
to
130c636
Compare
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.
@afbjorklund are we leaving out the vmware and parellles drivers ? if yes, could we import them too ?
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... |
@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 ? |
Parallells might be harder, since it is using a different license (MIT, rather than Apache-2.0)
But you already have all of this under
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.
*/ |
Same for the Apache license notices:
|
06086ad
to
601d6d1
Compare
601d6d1
to
3eafd42
Compare
@afbjorklund: The following test failed, say
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. |
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:
Remove the deprecated hyperkit driver #21603
kvm: Convert to internal driver #21625
Issue #21619