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

busybox image: add symlink for /bin/tee #55417

Merged

Conversation

justinsb
Copy link
Member

@justinsb justinsb commented Nov 9, 2017

This makes the bazel image more similar to the bash build, which uses
the image from the docker registry.

tee is used by e.g. kops to send logs to both a /var/log file and to
stdout (which is then captured by docker).

Add /bin/tee symlink to bazel build for busybox, so that CI builds have /bin/tee

This makes the bazel image more similar to the bash build, which uses
the image from the docker registry.

tee is used by e.g. kops to send logs to both a /var/log file and to
stdout (which is then captured by docker).
@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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 9, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 9, 2017
@cblecker
Copy link
Member

cblecker commented Nov 9, 2017

@justinsb is there an open PR for this change against master, or is not needed there?

@justinsb
Copy link
Member Author

justinsb commented Nov 9, 2017

This should fix e.g. https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/pr-logs/pull/52755/pull-kubernetes-e2e-kops-aws-prow/18/

My theory is that CI builds build busybox via bazel, and these images don't have /bin/tee (unlike the "real" images built by the bash process, which use the "official" docker build)

cc @krzyzacy

@justinsb
Copy link
Member Author

justinsb commented Nov 9, 2017

And @cblecker it looks like in 1.8 we switched to use the official docker image in the bazel build, so this can't apply to master.

Not sure if we want to backfix 1.7, as this seems to only affect CI...

@justinsb justinsb requested a review from krzyzacy November 9, 2017 18:07
@krzyzacy
Copy link
Member

krzyzacy commented Nov 9, 2017

/assign @mwielgus
oh oh the tests are still blocked by #55362

@cblecker
Copy link
Member

/retest

1 similar comment
@justinsb
Copy link
Member Author

/retest

@krzyzacy
Copy link
Member

/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 17, 2017
@krzyzacy
Copy link
Member

can someone approve this PR :-) We are blocking on this to migrate kops presubmit off Jenkins

@cblecker
Copy link
Member

/approve no-issue

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, justinsb, krzyzacy

Associated issue requirement bypassed by: cblecker

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2017
@cblecker
Copy link
Member

ping @mwielgus for cherry-pick approval

@mwielgus mwielgus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 17, 2017
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@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.

1 similar comment
@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.

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit d400757 into kubernetes:release-1.7 Nov 19, 2017
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

9 participants