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 upstream 2020-06-17 #77

Merged

Conversation

honza
Copy link
Member

@honza honza commented Jun 17, 2020

There are a couple of commits on top of the merge:

  • Updating the vendor directory to work with golang 1.14 (automatic change)
  • Removing the -mod=vendor flag from the build command

This solves the same problem as #76 but it's more elegant. Golang 1.14 introduces new defaults that make the mod flag unnecessary in our scenario (both upstream and downstream).

zaneb and others added 14 commits May 22, 2020 14:34
Sometimes a caller actually needs to know whether we succeeded in
changing the provisioning state or if we're just retrying because of a
conflict.

Mostly it doesn't though, so implement it as a separate method to avoid
adding complexity everywhere.
Add reviewers who are not already in the approvers list based on the
policy described in metal3-io/metal3-docs#93

dukov also qualifies, but is not yet a member of the org so will be
added near the end of the transition

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Add tryChangeNodeProvisionState() method in ironic provisioner
Change-Id: Ic0521a8308a15202ec5ed90fea44fc0f02b6d2de
Golang 1.14 introduces new defaults around modules, namely the -mod
flag.  If a vendor directory is present, it will be used; if it's not,
the new go module system will be used.  This will allow us to build this
module in a variety of environments without changing our build scripts.
Golang 1.14 introduces some small changes to the semantics of the go.mod
file so we are updating it to reflect that (this is done with `go mod
tidy`, not by hand.).
Add Dmitry Ukov to reviewers list
Upgrade module to Golang 1.14, and tidy modules
🏃 Add small changes to BMO and Ironic deployment documentation
Go 1.14 introduces some new semantics, this is an auto generated change.
Go 1.14 introduces new defaults that make this unnecessary.

If a vendor directory is present, it will be used.  If it's absent, the
regular go module system will be used.
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2020
@stbenjam
Copy link
Member

/test e2e-metal-ipi

@stbenjam
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: honza, stbenjam

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 ac7d56f into openshift:master Jun 23, 2020
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants