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

Reorganize vendor licenses again (revert #85220) #90575

Merged
merged 6 commits into from May 9, 2020

Conversation

thockin
Copy link
Member

@thockin thockin commented Apr 29, 2020

/kind cleanup

What this PR does / why we need it:

Try again to restructure license files for easier review. This is a revert and
cleanup on top of #85220, which was itself a revert of #76586.

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 29, 2020
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2020
@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/release Categorizes an issue or PR as relevant to SIG Release. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 29, 2020
@thockin
Copy link
Member Author

thockin commented Apr 29, 2020

/retest

1 similar comment
@thockin
Copy link
Member Author

thockin commented Apr 29, 2020

/retest

@k8s-ci-robot k8s-ci-robot added area/provider/gcp Issues or PRs related to gcp provider sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. labels Apr 29, 2020
@thockin
Copy link
Member Author

thockin commented May 1, 2020

/retest

@thockin
Copy link
Member Author

thockin commented May 1, 2020

@liggitt since you orchestrated the revert - any thoughts on how to get the failing signal to fail/pass BEFORE committing? Is there a way I can manually trigger those tests? @BenTheElder too

@liggitt
Copy link
Member

liggitt commented May 1, 2020

paging back in what went wrong... I vaguely remember a different install path taken when testing from built CI artifacts (like we do in postsubmits) rather than building on the fly in the job itself (like we do in presubmits, maybe?)?

#85196 (comment)
looked like it pointed to
https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/gci/configure.sh#L325

which looked like the output was missing a LICENSE file it previously had?

@thockin
Copy link
Member Author

thockin commented May 1, 2020

Yes, BUT dims@ tried to fix that and it failed differently. I am trying a different fix, but I need to iterate on kicking those tests off...

@BenTheElder
Copy link
Member

I wasn't aware that CI vs presubmit was using a different install path on GCE ...
That rabbit hole may take some doing to explore ...

@BenTheElder
Copy link
Member

cc @amwat @cheftako FYI re: GCE cluster scripts

@thockin
Copy link
Member Author

thockin commented May 1, 2020

Is there a way I can kick off the gci tests to see how they fare with this PR BEFORE merging?

@BenTheElder
Copy link
Member

pull-kubernetes-e2e-gce* are running with kube-up on GCE (GCI is pretty meaningless at this point). there are a LOT of different things running on GCE with various options though. I don't think anybody knows all of them.

Kicking off periodic / postsubmit jobs from a PR is not something prow supports as far as I know, at best prow supports trying to convert from one type of job to another by hand in the config and having that be optionally triggered.

gce-cos-master-default should be the CI version of pull-kubernetes-e2e-gce I think.

@liggitt
Copy link
Member

liggitt commented May 8, 2020

🎉

@liggitt
Copy link
Member

liggitt commented May 8, 2020

changes lgtm after commit cleanup

@liggitt
Copy link
Member

liggitt commented May 8, 2020

actually, maybe you already did the commit cleanup... in which case

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 8, 2020
@thockin
Copy link
Member Author

thockin commented May 8, 2020

For future me:

To test bazel building of the release:

mkdir -p $HOME/tmp/build_output
docker run -it \
  -e USER="$(id -u)" \
  -u="$(id -u)" \
  -v /etc/passwd.cache:/etc/passwd:ro \
  -v `pwd`:/src/workspace \
  -v $HOME/tmp/build_output:$HOME/tmp/build_output \
  -w /src/workspace \
  l.gcr.io/google/bazel:2.2.0 \
    --output_user_root=$HOME/tmp/build_output  \
    build \
    --sandbox_debug \
    --logging=6 \
    --verbose_failures \
    -- \
    //build/release-tars

Then you can look at the resulting tar files.

To test the GCI build:

rm -rf /tmp/workspace
mkdir -p /tmp/workspace/_artifacts
GOPATH=/tmp/go \
nice -n 19 \
kubetest \
  --dump=/tmp/workspace/_artifacts \
  --build --up --test --down \
  --provider=gce \
  --cluster=bootstrap-e2e \
  --gcp-network=bootstrap-e2e \
  --check-leaked-resources \
  --gcp-node-image=gci \
  --gcp-zone=us-west1-b \
  --runtime-config=api/all=true \
  --test_args=--ginkgo.focus=PodPreset.should.create.a.pod.preset \
  --ginkgo.skip= \
  --minStartupPods=8 \
  --build \
  --gcp-project=thockin-dev-2 \
  2>&1 | tee /tmp/workspace/build.log

This runs pretty fast since there is only on actual test running.

@thockin
Copy link
Member Author

thockin commented May 8, 2020

@liggitt or @dims - anyone who has to review deps -- this should make you happy, so I call upon you to review it. You probably can skim the commit that generates the files themselves

@liggitt
Copy link
Member

liggitt commented May 8, 2020

tagged, drop the WIP prefix and it should be all set

@dims
Copy link
Member

dims commented May 8, 2020

/approve
/lgtm

@thockin thockin changed the title WIP: Reorganize vendor licenses again (revert #85220) Reorganize vendor licenses again (revert #85220) May 8, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 8, 2020
@justaugustus
Copy link
Member

/retest

3 similar comments
@thockin
Copy link
Member Author

thockin commented May 8, 2020

/retest

@thockin
Copy link
Member Author

thockin commented May 8, 2020

/retest

@thockin
Copy link
Member Author

thockin commented May 9, 2020

/retest

@BenTheElder
Copy link
Member

this has gotten flakier :(
conntrack / TCP close_wait we have a test fix out for, just went back and reviewed that

@BenTheElder
Copy link
Member

belated
/lgtm
/approve

bash / bazel / ... looks good 👍

Purge almost all memories of godep

unlikely 🙃

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, dims, 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

@liggitt
Copy link
Member

liggitt commented May 9, 2020

The statefulset flake is root caused and has a fix in the queue as well

@BenTheElder
Copy link
Member

/retest
teardown / timeout failure for kubemark-e2e-gce-big ...

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 7d53ece into kubernetes:master May 9, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone May 9, 2020
@thockin
Copy link
Member Author

thockin commented May 9, 2020

w00t. I did something useful. Kind of useful, anyway.

@dims
Copy link
Member

dims commented May 9, 2020

Kudos Tim!

yuga711 pushed a commit to yuga711/kubernetes that referenced this pull request Dec 3, 2020
OSS changed a singular LICENSES file to a LICENSES directory tree
in kubernetes#90575

This commit:
* restores OSS changes in build/lib/release.sh and build/root/BUILD.root
* rewrites the boringcrypto build additions to copy licenses into LICENSES/host/... subdirs

This commit should be squashed into the BoringCrypto commit.

Change-Id: I1346440f0be318e40bcdae74afe1b7dbc87f51ef
yuga711 pushed a commit to yuga711/kubernetes that referenced this pull request Dec 3, 2020
Godeps/LICENSES file was removed in 1.19 in kubernetes#90575

Change-Id: I51de83e76f3cea07f7e8371dc2aa7dd706324c09
jingxu97 pushed a commit to jingxu97/kubernetes that referenced this pull request Mar 2, 2021
This commit includes support both for the dockerized make build flow
as well as bazel, though bazel builds require the glibc-source package
to be installed with apt.

Key changes compared to upstream:
* force all binaries to be dynamically linked
* force fipsonly encryption on kubectl
* include glibc source in kubernetes-src.tar.gz
* include glibc, go stdlib, and boringSSL licenses in LICENSES

This was cherry-picked from the release-1.19 branch.

Original Change-Id: Ic6fdb03f3340e0b4548c2c586570ab2d35fc7ef3

-

OSS changed a singular LICENSES file to a LICENSES directory tree
in kubernetes#90575

This commit:
* restores OSS changes in build/lib/release.sh and build/root/BUILD.root
* rewrites the boringcrypto build additions to copy licenses into LICENSES/host/... subdirs

This commit should be squashed into the BoringCrypto commit.

Original Change-Id: I1346440f0be318e40bcdae74afe1b7dbc87f51ef

-

Rebase core images on an internal go-runner which contains glibc.
GKE's boringcrypto-patched binaries require glibc at runtime.

bug=167220504
bug=170986849

Original Change-Id: I1dbc0ca45379e80b746a1a334a214087408f716f

Change-Id: I56c4148b1a0e665ce5c86a945bb35a98bd5ea581
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/provider/gcp Issues or PRs related to gcp provider 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/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. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. 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/release Categorizes an issue or PR as relevant to SIG Release. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants