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

Jump to bottom

Pivot cloudprovider/cluster-api to machine.openshift.io/v1beta1 #29

Merged
merged 7 commits into from
Feb 7, 2019
Merged

Pivot cloudprovider/cluster-api to machine.openshift.io/v1beta1 #29

merged 7 commits into from
Feb 7, 2019

Conversation

frobware
Copy link

@frobware frobware commented Jan 24, 2019 •
edited

This PR switches to using the machine.openshift.io/v1beta1 group and types.

Additionally it:

  • vendors from https://github.com/openshift/cluster-api (branch release-4.0)
  • renames the existing provider to cloudprovider/openshiftmachineapi
  • changes the provider name to "openshift-machine-api"
  • changes the annotation keys from "sigs.k8s.io" to "machine.openshift.io"
  • updates the e2e tests to use the new group and types

The openshift-autoscaler-operator will need to be updated to pickup the provider name change.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 24, 2019
@frobware
Copy link
Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2019
@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch from 935dc30 to 71e4a1c Compare January 24, 2019 15:12
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 24, 2019
@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch from 71e4a1c to 66cb1ab Compare January 29, 2019 18:29
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 29, 2019
@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch 2 times, most recently from aa8e70d to ed3b1f1 Compare January 30, 2019 12:33
@frobware
Copy link
Author

/test images

@frobware
Copy link
Author

/test e2e-aws-operator

@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch from ce2705c to c3b4f7b Compare January 30, 2019 16:09
@frobware
Copy link
Author

/test e2e-aws-operator

@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch from c8fc96d to abad942 Compare January 31, 2019 10:39
@frobware frobware changed the title [WIP] Pivot cluster-api cloudprovider to openshift-cluster-api Switch to cloudprovider/cluster-api to machine.openshift.io/v1beta1 Jan 31, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 31, 2019
@frobware frobware changed the title Switch to cloudprovider/cluster-api to machine.openshift.io/v1beta1 Switch cloudprovider/cluster-api to machine.openshift.io/v1beta1 Jan 31, 2019
@frobware frobware changed the title Switch cloudprovider/cluster-api to machine.openshift.io/v1beta1 Switch cloudprovider/cluster-api to use group/types machine.openshift.io/v1beta1 Jan 31, 2019
@frobware frobware force-pushed the clusterapi-provider-machine-api-pivot branch from 9509214 to d986044 Compare February 4, 2019 10:37
@frobware
Copy link
Author

frobware commented Feb 4, 2019

/test e2e-aws-operator

@frobware
Copy link
Author

frobware commented Feb 5, 2019

/refresh

bison
bison approved these changes Feb 5, 2019
View reviewed changes
Copy link

@bison bison left a comment

Choose a reason for hiding this comment

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

/lgtm

⚖️

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/approve

@ingvagabund
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@ingvagabund
Copy link
Member

/retest

@frobware
Copy link
Author

frobware commented Feb 7, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2019
@spangenberg spangenberg mentioned this pull request Feb 7, 2019
Merged
@frobware frobware changed the title Switch cloudprovider/cluster-api to use group/types machine.openshift.io/v1beta1 Pivot cloudprovider/cluster-api to machine.openshift.io/v1beta1 Feb 7, 2019
@ingvagabund
Copy link
Member

/retest

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019 •
edited

/test e2e-aws-operator

CAO image went through payload:

docker run -it registry.svc.ci.openshift.org/openshift/origin-release:v4.0 image cluster-autoscaler-operator
registry.svc.ci.openshift.org/openshift/origin-v4.0-2019-02-07-185327@sha256:00709acca9da90e0cc57d4c58be24049f150dda954ecca7b12c7c2e76dd87216

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/test e2e-aws-operator

@enxebre enxebre mentioned this pull request Feb 7, 2019
Merged
@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/approve

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@ingvagabund
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@ingvagabund
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@frobware
Copy link
Author

frobware commented Feb 7, 2019

/test e2e-aws-operator

@frobware
Copy link
Author

frobware commented Feb 7, 2019

/retest

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/test e2e-aws-operator

1 similar comment
@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/test e2e-aws-operator

@openshift-merge-robot openshift-merge-robot merged commit 93cb238 into openshift:master Feb 7, 2019
@frobware frobware deleted the clusterapi-provider-machine-api-pivot branch March 22, 2019 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@enxebre enxebre enxebre left review comments

@ingvagabund ingvagabund ingvagabund left review comments

@bison bison bison approved these changes

@spangenberg spangenberg Awaiting requested review from spangenberg

@vikaschoudhary16 vikaschoudhary16 Awaiting requested review from vikaschoudhary16

Assignees

@bison bison

@enxebre enxebre

@ingvagabund ingvagabund

Labels
lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@frobware @enxebre @ingvagabund @bison @openshift-ci-robot @openshift-merge-robot