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 with upstream metal3-io/baremetal-operator #57

Merged
merged 99 commits into from Apr 14, 2020

Conversation

beekhof
Copy link

@beekhof beekhof commented Apr 10, 2020

Resolve merge conflicts

zaneb and others added 30 commits January 21, 2020 18:40
If we end up reconciling the Host again after starting an inspection in
Ironic, but before the IntrospectionStatus is available in
ironic-inspector, we don't want to attempt to start another inspection.
Check if the host is already in the correct state in Ironic before
trying to change the state to 'inspecting'.

This issue was identified in metal3-io#393, but may not be the cause.
InvolvedObject APIVersion is expected to be SchemeGroupVersion string
Co-authored-by: Xenwar <anwar.hassen@est.tech>
Restructure kustomization and Add Ironic-Endpoint using Keepalived
The example path is a bit confusing to users, so replace it with an
actual working value from real hardware. Also add an example from the
ironic documentation at
https://docs.openstack.org/ironic/latest/admin/drivers/redfish.html

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Removing the privileged security context to have a more
fine-grained control with capabilities. NET_ADMIN set for
dnsmasq and httpd (in case the user specifies a low port)
Remove container privileges and add NET_ADMIN capability
…xample

update example URL for redfish driver
There is a typo for DisableCertificateVerification that
causes the e2e tests to fail.

Signed-off-by: Yolanda Robla <yroblamo@redhat.com>
Add available ProvisioningState  , so CAPBM is aware of this state
This is to comply with CAPI secrets
Look for userData or value in the userdata secret
Add a Pause annotation for pivoting
Update Configuration with Kustomize info
@beekhof
Copy link
Author

beekhof commented Apr 10, 2020

Looks like some of the dependancies @n1r1 added got lost in the Gopk.toml -> go.mod transition. Will fix

@beekhof
Copy link
Author

beekhof commented Apr 11, 2020

Test failures seem related to this sequence of commits:

  • Honza Pokorny (6 weeks ago) c5b42d6: Export cache dir in gofmt
  • Honza Pokorny (7 weeks ago) 0af5bf7: Unset GOFLAGS
  • Honza Pokorny (10 weeks ago) 580210b: Update dockerfile to build from golang 1.13
  • Honza Pokorny (10 weeks ago) eb7b204: Update travis to use go modules
  • Honza Pokorny (6 weeks ago) 8e38ebd: Upgrade operator-sdk 
  • Honza Pokorny (6 weeks ago) 0f8c3f4: Remove Gopkg files and vendor directory
  • Honza Pokorny (6 weeks ago) ca00c0b: Migrate to go modules

@honza can you share the secret sauce that allows upstream to build without a vendor directory?

@n1r1
Copy link

n1r1 commented Apr 13, 2020

/retest

@stbenjam
Copy link
Member

/refresh

@stbenjam
Copy link
Member

stbenjam commented Apr 13, 2020

I think to make this work, you'll need to run go mod vendor and generate the vendor/ directory for the openshift fork. CI can't download the modules on the fly.

I assume it probably needs to be an OCP-only thing, since I wouldn't expect upstream to carry milions of lines of vendored code because of a limitation on our CI servers.

Upstream has moved to a vendorless codebased, however downstream CI
still requires it, even after being configured to use go 1.13+

Signed-off-by: Andrew Beekhof <andrew@beekhof.net>
@stbenjam
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2020
@stbenjam
Copy link
Member

@hardys @dhellmann @russellb Could one of you approve please? Thanks!

@hardys
Copy link

hardys commented Apr 14, 2020

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: beekhof, hardys, 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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2020
@openshift-merge-robot openshift-merge-robot merged commit 5a5f5fb into openshift:master Apr 14, 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