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

vendor: update openshift/cluster-api #23

Merged

Conversation

russellb
Copy link
Member

This PR updates our vendored copy of cluster-api to the latest version from the openshift-4.0-cluster-api-0.0.0-alpha.4 branch.

Once this merges, I will backport it to the release-4.1 branch.

master will then need to get updated to a 4.2 branch of openshift/cluster-api, but this PR is the first step.

@russellb russellb requested a review from mhrivnak May 15, 2019 18:39
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 15, 2019
@russellb russellb removed the request for review from hardys May 15, 2019 18:39
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2019
@russellb
Copy link
Member Author

/test images

got killed in the middle for some reason ...

@russellb
Copy link
Member Author

not sure about this go vet vailure. I don't get any errors locally.

This pulls in the latest changes from the
openshift-4.0-cluster-api-0.0.0-alpha.4 branch of
openshift/cluster-api.
@russellb russellb force-pushed the openshift-cluster-api-update branch from 797cb23 to cf7bf62 Compare May 15, 2019 20:42
@russellb russellb requested a review from hardys May 15, 2019 21:13
Copy link

@dhellmann dhellmann left a comment

Choose a reason for hiding this comment

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

I'll wait for the CI job to pass before leaving a formal go-ahead, but this looks good.

@russellb
Copy link
Member Author

@dhellmann All of the CI jobs have passed now. The last one (tide) is the one that runs only after it's approved for merging

@dhellmann
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 15, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, 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

@openshift-merge-robot openshift-merge-robot merged commit 9ac0b4b into openshift:master May 15, 2019
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

4 participants