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.

Sign up for GitHub

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

Jump to bottom

Determine SPDX license from command line (+bug fix) #2242

Merged
merged 2 commits into from
Sep 11, 2021
Merged

Determine SPDX license from command line (+bug fix) #2242

merged 2 commits into from
Sep 11, 2021

Conversation

puerco
Copy link
Member

@puerco puerco commented Sep 10, 2021 •
edited
Loading

What type of PR is this?

/kind bug
/kind feature

What this PR does / why we need it:

This PR adds a feature and fixes a bug in the SBOM generator:

  1. Fixes a bug where the SPDX relationships in multiarch images where expressed backwards in the document.
  2. Adds a new flag --license to specify the project license from the command line, this was already possible using a config file.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

- SPDX: Fixed a bug where the `VARIANT_OF` relationship in multiarch container images was expressed backwards
- New `-l` | `--license` flag to define the project's license from the command line

@puerco
Fix SPDX relationship order btw images and ref
223ea76 
This commit fixes a bug where the VARIANT_OF relationship between
a container image reference and the actual images was backwards.

Signed-off-by: Adolfo García Veytia (Puerco) <[email protected]>
@puerco
Support license definition from command flag
97610cf 
This commit adds a new flag to bom generate: `--license`.

When defined, the project will use the license from the flag as
default. It is the equivalent as defining `license:` in a YAML
config file.

Signed-off-by: Adolfo García Veytia (Puerco) <[email protected]>
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 10, 2021
@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 10, 2021
cpanato
cpanato approved these changes Sep 11, 2021
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 11, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, puerco

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

@k8s-ci-robot k8s-ci-robot merged commit 82a3a9d into kubernetes:master Sep 11, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpanato cpanato cpanato approved these changes

@mkorbi mkorbi Awaiting requested review from mkorbi

@xmudrii xmudrii Awaiting requested review from xmudrii

Assignees

@cpanato cpanato

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.
3 participants
@puerco @k8s-ci-robot @cpanato