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

Run update-licenses #6296

Merged
merged 1 commit into from Aug 24, 2023
Merged

Conversation

SgtCoDFish
Copy link
Member

Somehow #6293 was merged without this being fixed!

Pull Request Motivation

Kind

/kind cleanup

Release Note

NONE

@jetstack-bot jetstack-bot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/testing Issues relating to testing approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 24, 2023
@SgtCoDFish
Copy link
Member Author

@inteon Tagging you since you reviewed the original PR! Not sure what happened here, hopefully this fixes

@inteon
Copy link
Member

inteon commented Aug 24, 2023

/test pull-cert-manager-master-license

somehow cert-manager#6293 was merged without this being fixed

Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
@SgtCoDFish
Copy link
Member Author

/test pull-cert-manager-master-license

@SgtCoDFish
Copy link
Member Author

/test pull-cert-manager-master-make-test

@inteon inteon added this to the 1.13 milestone Aug 24, 2023
@SgtCoDFish
Copy link
Member Author

SgtCoDFish commented Aug 24, 2023

I think that running make update-licenses on macOS produces different output to what's produced on Linux! There was a genuine missing license entry here, but running locally also produced other changes. Worth further investigation for sure!

EDIT:

Here's the diff of what I get locally if I run on top of this commit

diff --git a/LICENSES b/LICENSES
index cbac05b9b..62383d63a 100644
--- a/LICENSES
+++ b/LICENSES
@@ -123,7 +123,7 @@ golang.org/x/exp,https://cs.opensource.google/go/x/exp/+/2e198f4a:LICENSE,BSD-3-
 golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.10.0:LICENSE,BSD-3-Clause
 golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.5.0:LICENSE,BSD-3-Clause
 golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.2.0:LICENSE,BSD-3-Clause
-golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.8.0:LICENSE,BSD-3-Clause
+golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.8.0:LICENSE,BSD-3-Clause
 golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.8.0:LICENSE,BSD-3-Clause
 golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.9.0:LICENSE,BSD-3-Clause
 golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause
diff --git a/cmd/controller/LICENSES b/cmd/controller/LICENSES
index 897fbb35d..fa7dfdccf 100644
--- a/cmd/controller/LICENSES
+++ b/cmd/controller/LICENSES
@@ -115,7 +115,7 @@ golang.org/x/exp,https://cs.opensource.google/go/x/exp/+/2e198f4a:LICENSE,BSD-3-
 golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.10.0:LICENSE,BSD-3-Clause
 golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.5.0:LICENSE,BSD-3-Clause
 golang.org/x/sync/errgroup,https://cs.opensource.google/go/x/sync/+/v0.2.0:LICENSE,BSD-3-Clause
-golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.8.0:LICENSE,BSD-3-Clause
+golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.8.0:LICENSE,BSD-3-Clause
 golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.8.0:LICENSE,BSD-3-Clause
 golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.9.0:LICENSE,BSD-3-Clause
 golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause
diff --git a/test/e2e/LICENSES b/test/e2e/LICENSES
index 9430f7244..ee2b76d8d 100644
--- a/test/e2e/LICENSES
+++ b/test/e2e/LICENSES
@@ -40,6 +40,7 @@ github.com/kr/pretty,https://github.com/kr/pretty/blob/v0.3.1/License,MIT
 github.com/kr/text,https://github.com/kr/text/blob/v0.2.0/License,MIT
 github.com/mailru/easyjson,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT
 github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/v1.0.4/LICENSE,Apache-2.0
+github.com/mitchellh/go-homedir,https://github.com/mitchellh/go-homedir/blob/v1.1.0/LICENSE,MIT
 github.com/mitchellh/mapstructure,https://github.com/mitchellh/mapstructure/blob/v1.5.0/LICENSE,MIT
 github.com/moby/spdystream,https://github.com/moby/spdystream/blob/v0.2.0/LICENSE,Apache-2.0
 github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0

@inteon
Copy link
Member

inteon commented Aug 24, 2023

/approve
/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 24, 2023
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: inteon, SgtCoDFish

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

@jetstack-bot jetstack-bot merged commit 88ad019 into cert-manager:master Aug 24, 2023
7 checks passed
@SgtCoDFish SgtCoDFish deleted the licensefix branch August 24, 2023 16:41
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. area/testing Issues relating to testing dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants