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

Merge master from metal3-io/cluster-api-provider-baremetal. #26

Merged
merged 25 commits into from
May 17, 2019

Conversation

russellb
Copy link
Member

No description provided.

dhellmann and others added 25 commits April 18, 2019 16:26
Replace the vendored version of the baremetal-operator code with the
one from the new location, which includes corrected imports.

Make all of the local code updates needed.
A discovered host is not available but also does not have a machineRef
set, so the pointer is nil.
Discovered hosts are not ready and have an error message. Add a unit
test with a host like that so we can ensure we don't have a problem
ignoring them.
add unit test to deal with unprovisioned host with error
The values passed in with the ProviderSpec were previously hard-coded. Any user
of Machines or MachineSets with this controller will need to start including a
suitable ProviderSpec.
Adds ProviderSpec with settings for image and userdata.
This matches what the baremetal-operator uses by default, as well.
Use the metal3 namespace for the components built from the cluster-api
repository, as well.
Use metal3 namepsace for cluster-api components.
cluster-api-provider-baremetal-controller-manager-metrics-service is
too long.  s/service/svc/ gets it under the limit.
Update to match the name of the binary in the container image we build.
This constant came from the sample provider implementation in
cluster-api docs.  It was missed when changing the sample to use
"baremetal" everywhere instead of the sample "solas" provider.
Fix ProviderName to be "baremetal".
This syncs with master of cluster-api, which closes metal3-io#71.
Update to latest master from cluster-api.
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 17, 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 May 17, 2019
russellb added a commit to russellb/release that referenced this pull request May 17, 2019
The upstream org for this repo moved from metalkube/ to metal3-io/.

The follow openshift PR depends on this update to the canonical go
repo: openshift/cluster-api-provider-baremetal#26
@russellb
Copy link
Member Author

/retest

@dhellmann
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 17, 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

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.

5 participants