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 04 #73

Merged
merged 138 commits into from Jun 11, 2020

Conversation

honza
Copy link
Member

@honza honza commented Jun 4, 2020

No description provided.

furkatgofurov7 and others added 30 commits April 10, 2020 23:26
operator-sdk 'up local' is now 'run --local' since v0.15.0.

Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>
…rkat-test-bmo

ironic_bmo_variables.rc is removed
Metadata is required for cloud-init config drive which is used by
Ironic. User should be able to create custom metadata in a secret and
reference it in a BareMetalHost object.

Change-Id: I0af37b39602280adb87ea72554833b500f58be71
Co-Authored-By: Doug Hellmann <dhellmann@redhat.com>
Change-Id: I7aa6b03293209dc87c4cb439198351fc371f1c9f
Change-Id: I66637b44516e736e4c617665df7c4c2f29547384
Empty namespaces in meta-data object references now default to the
baremetalhost namespace

Change-Id: Id3f4317e8444b287ee50fd85cae82227cfc4f1b0
Implement metadata interface for baremetal operator
Make BMO as part of CAPM3 deployment
OCP Baremetal IPI inside of Openstack environment requires the RootDeviceHint to be /dev/vdb when a pxeboot is performed given that OSP uses nova rescue and a pxeboot.img as /dev/vda.
Updated profile table to document openstack profile and disk
Put BMH status in annotation while reconciliation
operator-sdk removed the openapi generation command in v0.17.0.
Since we updated to operator-sdk 0.17.0 developers need to install
openapi-gen separately.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Running `make gosec` introduces changes to the local working
directory, so let's update the dependencies properly.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
There's no sense in running the same job on both prow and travis.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
The validation rules need to be set where the type is defined, not
where it is used.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Add a make target 'generate-check' to ensure that both the code and
CRDs have been regenerated for any change.

Add hack/Dockerfile.operator-sdk to build an image containing the
operator-sdk and other dependencies for the generator check.

Add hack/generate.sh to run the check in a container using the image
built by the new Dockerfile.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
set up check to ensure operator-sdk generation is done
Expand the docker make target to test both docker files that appear in
the repo. The existing travis-ci job will try to build both images.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
gofmt does not return an error code if it can successfully find
changes, but for the prow linter job we want this script to return an
error if the code is not already formatted. Look for the list of files
gofmt would change, and if the list is not empty then show the diffs
it would make.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
@stbenjam
Copy link
Member

stbenjam commented Jun 5, 2020

So what was the outcome of this? I saw some chat on Slack that indicated maybe we need to pull in some changes to CAPBM.

@dhellmann Could we get metal3-io#546 broken out to a separate PR? That's very important to make 4.5 GA.

@dhellmann
Copy link

So what was the outcome of this? I saw some chat on Slack that indicated maybe we need to pull in some changes to CAPBM.

@dhellmann Could we get metal3-io#546 broken out to a separate PR? That's very important to make 4.5 GA.

@stbenjam I filed #75 with just the annotation sync fixes.

furkatgofurov7 and others added 2 commits June 5, 2020 17:38
Older versions of ironic that do not have
https://review.opendev.org/#/c/711816/ refuse to provision if the
image information does not include 'image_checksum', even if the other
hash value parameters are given. It seems safe to always pass the old
name, so go ahead and do so.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
@dhellmann
Copy link

So what was the outcome of this? I saw some chat on Slack that indicated maybe we need to pull in some changes to CAPBM.

We will also need to pull the API changes into CAPBM before the root device hints will work properly, but (perhaps contrary to what I thought) we should be able to land this PR without first updating CAPBM because nothing should be using the new fields yet anyway.

@stbenjam
Copy link
Member

stbenjam commented Jun 8, 2020

/test e2e-metal-ipi

@honza
Copy link
Member Author

honza commented Jun 9, 2020

/test e2e-metal-ipi

1 similar comment
@honza
Copy link
Member Author

honza commented Jun 10, 2020

/test e2e-metal-ipi

@dhellmann
Copy link

I see that this PR includes earlier changes to how we pass image checksums to ironic. We may need to add metal3-io#549 to support the older ironic we have in openshift.

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.

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 d997d9c into openshift:master Jun 11, 2020

.PHONY: tools
tools:
@echo LDFLAGS=$(LDFLAGS)
go build -mod=vendor -o build/_output/bin/get-hardware-details cmd/get-hardware-details/main.go
go build -o build/_output/bin/get-hardware-details cmd/get-hardware-details/main.go
Copy link
Member

Choose a reason for hiding this comment

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

@honza This broke the OSE build -- how do we make sure your script preserves this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch, I'll fix it ASAP.

This will go away if we upgrade to Golang 1.14. From the docs:

When the main module contains a top-level vendor directory and its go.mod file specifies go 1.14 or higher, the go command now defaults to -mod=vendor for operations that accept that flag. A new value for that flag, -mod=mod, causes the go command to instead load modules from the module cache (as when no vendor directory is present).

I'll see about upgrading the module to 1.14.

Copy link
Member Author

Choose a reason for hiding this comment

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

#76

Copy link
Member Author

Choose a reason for hiding this comment

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

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