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.

Sign up for GitHub

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

add an API for machinepool -> machinesets #573

Merged
merged 2 commits into from
Nov 2, 2018
Merged

add an API for machinepool -> machinesets #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92442d
vendor: add cluster-api, aws, libvirt provider packages and k8s.io/utils
abhinavdahiya Oct 30, 2018
476be07
pkg/asset: use vendored cluster-api instead of go templates
abhinavdahiya Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 109 additions & 18 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ ignored = ["github.com/openshift/installer/tests*"]
name = "k8s.io/client-go"
version = "6.0.0"

[[constraint]]
name = "sigs.k8s.io/cluster-api"
branch = "master"
Copy link
Member

Choose a reason for hiding this comment

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

Do we really want these floating with master? Can we pin to their current tips and then manually bump when they make changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

master is fine

[[constraint]]
name = "sigs.k8s.io/cluster-api-provider-aws"
source = "https://github.com/openshift/cluster-api-provider-aws.git"
branch = "master"
[[constraint]]
name = "github.com/openshift/cluster-api-provider-libvirt"
branch = "master"

[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"
Expand All @@ -60,3 +71,7 @@ ignored = ["github.com/openshift/installer/tests*"]
[[constraint]]
name = "github.com/openshift/hive"
revision = "8c7844d9b61c35f53bab561f5ce4d879fef86ec6"

[[constraint]]
name = "k8s.io/utils"
revision = "4c3feeb576b06ef8fea769809bd3db5e5e78dc23"
Loading