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

Fix #76093, restructure LICENSES file generation #76586

Merged
merged 2 commits into from Nov 13, 2019
Merged

Fix #76093, restructure LICENSES file generation #76586

merged 2 commits into from Nov 13, 2019

Conversation

JishanXing
Copy link
Contributor

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Fix #76093, restructure LICENSES file generation

Which issue(s) this PR fixes:
#76093

Special notes for your reviewer:
Proposal:

  1. This fix will generate the LICENSE file for each package under vender/ and put them to Godeps/ALL_LICENSES/
  2. The LICENSE file name format is "bitbucket.org:bertimus9:systemstat", use colon to separate the package:subpackage.
    So the output for Godeps/ALL_LICENSES is below:
    src/k8s.io/kubernetes/Godeps/ALL_LICENSES]> ls
    bitbucket.org:bertimus9:systemstat github.com:marstr:guid
    cloud.google.com:go github.com:mattn:go-shellwords
    github.com:armon:circbuf github.com:mattn:go-sqlite3
    github.com:asaskevich:govalidator github.com:matttproud:golang_protobuf_extensions
    github.com:aws:aws-sdk-go github.com:mesos:mesos-go
    github.com:Azure:azure-sdk-for-go github.com:mholt:caddy
    ......

Does this PR introduce a user-facing change?:

@k8s-ci-robot
Copy link
Contributor

@JishanXing: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 15, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @JishanXing. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 15, 2019
@k8s-ci-robot k8s-ci-robot added area/apiserver area/cloudprovider area/dependency Issues or PRs related to dependency changes sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 15, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 15, 2019
neolit123
neolit123 reviewed Apr 15, 2019
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/ok-to-test
/kind cleanup
/priority backlog
/assign @thockin @cblecker
as per #76093 (comment)

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 15, 2019
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@thockin thockin removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2019
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2019
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@dims
Copy link
Member

dims commented Nov 13, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 13, 2019 •
edited

@JishanXing: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-csi-serial 6001c2c8e2b1600acacaaefc9adfd4c22b04b2d9 link /test pull-kubernetes-e2e-gce-csi-serial
pull-kubernetes-e2e-gce-storage-slow 6001c2c8e2b1600acacaaefc9adfd4c22b04b2d9 link /test pull-kubernetes-e2e-gce-storage-slow

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JishanXing, thockin

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

@dims
Copy link
Member

dims commented Nov 13, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit c6c7e8b into kubernetes:master Nov 13, 2019
SIG Release automation moved this from In progress to Done (1.17) Nov 13, 2019
Licensing automation moved this from In progress to Done (1.17) Nov 13, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Nov 13, 2019
This was referenced Nov 13, 2019
Closed
Closed
@liggitt
Copy link
Member

liggitt commented Nov 13, 2019

this broke cluster bringup

Nov 13 07:19:59.610320 bootstrap-e2e-master configure.sh[733]: mv: cannot stat '/home/kubernetes/kubernetes/LICENSE': No such file or directory
Nov 13 07:19:59.610997 bootstrap-e2e-master systemd[1]: kube-master-installation.service: Main process exited, code=exited, status=1/FAILURE
Nov 13 07:19:59.611147 bootstrap-e2e-master systemd[1]: kube-master-installation.service: Failed with result 'exit-code'.
Nov 13 07:19:59.611795 bootstrap-e2e-master systemd[1]: Failed to start Download and install k8s binaries and configurations.

@liggitt liggitt mentioned this pull request Nov 13, 2019
Closed
liggitt
liggitt reviewed Nov 13, 2019
View reviewed changes
cluster/gce/gci/configure.sh
@@ -421,7 +421,7 @@ function install-kube-binary-config {
mv "${src_dir}/kubelet" "${KUBE_BIN}"
mv "${src_dir}/kubectl" "${KUBE_BIN}"

mv "${KUBE_HOME}/kubernetes/LICENSES" "${KUBE_HOME}"
mv "${KUBE_HOME}/kubernetes/LICENSE" "${KUBE_HOME}"
Copy link
Member

@liggitt liggitt Nov 13, 2019 •
edited

Choose a reason for hiding this comment

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

this does not exist in the artifacts consumed by some CI jobs, see https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce-alpha-features/1194514172650459137/artifacts/bootstrap-e2e-master/kube-master-installation.log

See #85215 #85214 #85213 #85196

Copy link
Member

Choose a reason for hiding this comment

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

fix in progress in #85210

Copy link
Member

Choose a reason for hiding this comment

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

Reverting just this line fixed some jobs and failed others. see test results in #85210

That means that some of our build paths produce this file, and some do not.

Reverting this PR in #85220 until we can resolve this issue consistently.

This was referenced Nov 13, 2019
Closed
Closed
k8s-ci-robot added a commit that referenced this pull request Nov 13, 2019
@k8s-ci-robot
Merge pull request #85220 from liggitt/revert-licenses
8af6906 
Revert #76586, restructure LICENSES file generation
@thockin thockin mentioned this pull request Apr 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@liggitt liggitt liggitt left review comments

@thockin thockin thockin left review comments

@cblecker cblecker cblecker requested changes

@gmarek gmarek Awaiting requested review from gmarek

@sttts sttts Awaiting requested review from sttts

Assignees

@dims dims

@cblecker cblecker

@thockin thockin

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-organization Issues or PRs related to kubernetes code organization area/dependency Issues or PRs related to dependency changes area/kubelet area/release-eng Issues or PRs related to the Release Engineering subproject area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
No open projects
Licensing
  
Done (1.17)
Milestone
v1.17
Development

Successfully merging this pull request may close these issues.

restructure LICENSES file generation