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.

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

Switch openshift/cluster-api branch. #9

Merged

Conversation

russellb
Copy link
Member

@russellb russellb commented Apr 2, 2019

Switch the openshift/cluster-api branch to
openshift-4.0-cluster-api-0.0.0-alpha.4, which contains the latest
rebase of cluster-api. Providers are not to be using the master
branch of openshift/cluster-api.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 2, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2019
@mhrivnak
Copy link
Member

mhrivnak commented Apr 2, 2019

It looks like the AWS provider is just using the https://github.com/openshift/cluster-api/tree/openshift-4.0-cluster-api-0.0.0-alpha.4 branch, which includes the patch. That branch is also using 1.13 kube code. You should be able to change that in Gopkg.toml, run dep ensure -u github.com/openshift/cluster-api, and then have the patch.

That said, I don't know what the expectations are around that branch or why it includes stuff not in master, but using that branch would get us to the same state as the aws and libvert providers.

@ingvagabund
Copy link
Member

ingvagabund commented Apr 2, 2019

As @mhrivnak describes. The master branch of openshift/cluster-api is considered dormant. Only https://github.com/openshift/cluster-api/tree/openshift-4.0-cluster-api-0.0.0-alpha.4 branch is supposed to be imported.

Please see https://github.com/openshift/cluster-api-provider-aws/blob/master/Gopkg.toml#L31-L33

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 2, 2019
@russellb russellb changed the title openshift/cluster-api: Fix klog init. Switch openshift/cluster-api branch. Apr 2, 2019
Switch the openshift/cluster-api branch to
openshift-4.0-cluster-api-0.0.0-alpha.4, which contains the latest
rebase of cluster-api.  Providers are not to be using the master
branch of openshift/cluster-api.
@mhrivnak
Copy link
Member

mhrivnak commented Apr 2, 2019

/lgtm

@openshift-ci-robot
Copy link

@mhrivnak: changing LGTM is restricted to assignees, and only openshift/cluster-api-provider-baremetal repo collaborators may be assigned issues.

In response to this:

/lgtm

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/test-infra repository.

@dhellmann
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 2, 2019
@openshift-merge-robot openshift-merge-robot merged commit 729c836 into openshift:master Apr 2, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, mhrivnak, russellb

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

The pull request process is described 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants