Skip to content

Openshift machine api #188

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

Merged
openshift-merge-robot merged 4 commits into from
Feb 1, 2019
Merged

Openshift machine api #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f72b89
Revendor for openshift-machine-api
enxebre Jan 31, 2019
c0cdaca
Update controllers to use openshift machine-api
enxebre Jan 31, 2019
304559d
Run both controllers simultaneously for k8s.io and openshift.io type
enxebre Jan 31, 2019
3fb5ada
Pin provider controllers to deprecated version
enxebre Jan 31, 2019
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
64 changes: 39 additions & 25 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.

4 changes: 2 additions & 2 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ required = [
branch = "release-1.10"

[[override]]
name = "sigs.k8s.io/cluster-api"
branch = "master"
name = "github.com/openshift/cluster-api"
revision = "91fca585a85b163ddfd119fd09c128c9feadddca"

@ingvagabund ingvagabund Feb 1, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fine for now though let's use tags once we finish the mirroring


[[override]]
name = "k8s.io/code-generator"
Expand Down
0 vendor/sigs.k8s.io/cluster-api/LICENSE → .../github.com/openshift/cluster-api/LICENSE
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions ...ter-api/pkg/apis/cluster/common/consts.go → ...ter-api/pkg/apis/cluster/common/consts.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...er-api/pkg/apis/cluster/common/plugins.go → ...er-api/pkg/apis/cluster/common/plugins.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...kg/apis/cluster/v1alpha1/cluster_types.go → ...kg/apis/cluster/v1alpha1/cluster_types.go
View file
Open in desktop

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

0 ...pkg/apis/cluster/v1alpha1/common_types.go → ...pkg/apis/cluster/v1alpha1/common_types.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...api/pkg/apis/cluster/v1alpha1/defaults.go → ...api/pkg/apis/cluster/v1alpha1/defaults.go
View file
Open in desktop

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

0 ...ster-api/pkg/apis/cluster/v1alpha1/doc.go → ...ster-api/pkg/apis/cluster/v1alpha1/doc.go
View file
Open in desktop
File renamed without changes.
59 changes: 37 additions & 22 deletions ...kg/apis/cluster/v1alpha1/machine_types.go → ...kg/apis/cluster/v1alpha1/machine_types.go
View file
Open in desktop

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

0 ...is/cluster/v1alpha1/machineclass_types.go → ...is/cluster/v1alpha1/machineclass_types.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...uster/v1alpha1/machinedeployment_types.go → ...uster/v1alpha1/machinedeployment_types.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...apis/cluster/v1alpha1/machineset_types.go → ...apis/cluster/v1alpha1/machineset_types.go
View file
Open in desktop

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

0 ...api/pkg/apis/cluster/v1alpha1/register.go → ...api/pkg/apis/cluster/v1alpha1/register.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...cluster/v1alpha1/zz_generated.deepcopy.go → ...cluster/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

Loading