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

sync upstream changes 2020-07-29 #88

Merged

Conversation

dhellmann
Copy link

  • implementation of boot mode API
  • OpenShift build variables to ensure the version info is compiled in properly
  • dep: cve: bump go-openapi/spec to v0.19.9
  • update CRD version to v1 for pruning feature

zaneb and others added 15 commits July 16, 2020 09:32
The existing apiextensions.k8s.io/v1beta1 version is deprecated and will
be removed in k8s 1.19. v1 is available from k8s 1.16.

Using v1, unknown fields are now pruned by default, which is what we
want.

Fixes metal3-io#327
Fixes metal3-io#580
Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
Reuse the logic for building the address for redfish drivers.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
go-openapi/spec v0.19.9 bumps go-openapi/jsonreference to v0.19.4
go-openapi/jsonreference v0.19.4 bumps golang.org/x/text to v0.3.3

golang.org/x/text v0.3.3 mitigates against CVE-2020-14040

https://groups.google.com/g/golang-announce/c/bXVeAmGOqz0?pli=1

Signed-off-by: Honza Pokorny <honza@redhat.com>
dep: cve: bump go-openapi/spec to v0.19.9
metal3-dev-env uses this program to create host resources. In order to
let metal3-dev-env change the boot mode for hosts, we need to add an
option to pass the value through to the template.

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
add -boot-mode argument to make-bm-worker
Switch CRD version to apiextensions.k8s.io/v1
The OpenShift release build environment exposes the SOURCE_GIT_COMMIT and BUILD_VERSION environment variables to reference the right git commit and current build version
Default to UEFI everywhere, but allow the user to override that value
by setting Spec.BootMode.

Implements https://github.com/metal3-io/metal3-docs/blob/master/design/baremetal-operator/explicit-boot-mode.md

Signed-off-by: Doug Hellmann <dhellmann@redhat.com>
@dhellmann dhellmann requested a review from honza July 29, 2020 19:35
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2020
@dhellmann dhellmann requested a review from zaneb July 29, 2020 19:35
go mod vendor; go mod tidy

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

zaneb commented Jul 30, 2020

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 f8936e8 into openshift:master Jul 30, 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

7 participants