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

UPSTREAM: <carry>: openshift: build fixes due to new cluster-api vendor and addition of managed identity #26

Merged
merged 2 commits into from
May 2, 2019

Conversation

awesomenix
Copy link

@awesomenix awesomenix commented May 2, 2019

What this PR does / why we need it:

  • build fixes due to new cluster-api vendor and addition of managed identity
  • revendor cluster-api dependency

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

NONE

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 2, 2019
@awesomenix awesomenix changed the title Openshift UPSTREAM: <carry>: openshift: build fixes due to new cluster-api vendor and addition of managed identity May 2, 2019
Copy link

@frobware frobware left a comment

Choose a reason for hiding this comment

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

Only nit/observation is the hard coding of 1.13.4. Presumably this is the same value that was previously coming from the machine/machine class object.

@frobware
Copy link

frobware commented May 2, 2019

/lgtm

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

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2019
@openshift-merge-robot openshift-merge-robot merged commit 7e23f23 into openshift:master May 2, 2019
@@ -370,6 +366,8 @@ func TestNodeJoinSecondControlPlane(t *testing.T) {
t.Errorf("failed to create machine: %+v", err)
}

t.Logf("%+v", fakeScope.Machine)
Copy link
Member

Choose a reason for hiding this comment

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

unintentionally left over?

@enxebre
Copy link
Member

enxebre commented May 3, 2019

thanks a lot! nit: instead of "build fixes due to new cluster-api vendor" which does not help for someone with no context we should point the openshift/cluster-api relevant PRs in the commit desc and mention what it does explicitly e.g "Adapt actuator to work without API fields dropped by openshift/cluster-api#35 and openshift/cluster-api#34"

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.

6 participants