Skip to content

Ensure base image includes the modprobe binary #53642

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
Merged
merged 2 commits into from
Oct 13, 2017
Merged

Ensure base image includes the modprobe binary #53642

merged 2 commits into from
Oct 13, 2017
+5 −4

Conversation

edevil
Copy link
Contributor

@edevil edevil commented Oct 10, 2017

What this PR does / why we need it:

Includes the kmod package so that "modprobe" is available for kubelet and kube-proxy.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #53396

@k8s-ci-robot
Copy link
Contributor

@edevil: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.

One of the following labels is required "release-note", "release-note-action-required", or "release-note-none".
Please see: https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#write-release-notes-if-needed.

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. 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. labels Oct 10, 2017
@k8s-ci-robot
Copy link
Contributor

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

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 10, 2017
@edevil
Copy link
Contributor Author

edevil commented Oct 10, 2017

/assign @jbeda

@edevil edevil mentioned this pull request Oct 10, 2017
Closed
@dims
Copy link
Member

dims commented Oct 10, 2017

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 10, 2017
@dims
Copy link
Member

dims commented Oct 10, 2017

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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 Oct 10, 2017
@dims
Copy link
Member

dims commented Oct 10, 2017

@jpbetz @jdumars @kubernetes/sig-release-members Should this be cherry-picked to 1.8 branch?

@jdumars
Copy link
Contributor

jdumars commented Oct 10, 2017

Sure looks like it to me. @jpbetz

@jdumars
Copy link
Contributor

jdumars commented Oct 10, 2017

@kubernetes/sig-node-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Oct 10, 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.

@ericchiang
Copy link
Contributor

ericchiang commented Oct 10, 2017 •
edited
Loading

cc @ixdy @rphillips

@ericchiang ericchiang added this to the v1.8 milestone Oct 10, 2017
@rphillips
Copy link
Member

I updated #52744 to also include kmod.

@rphillips rphillips mentioned this pull request Oct 10, 2017
Closed
@dchen1107
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 Oct 11, 2017
@ixdy ixdy mentioned this pull request Oct 11, 2017
Merged
@ixdy
Copy link
Contributor

ixdy commented Oct 11, 2017

Please also update

kubernetes/build/root/WORKSPACE

Lines 65 to 71 in a69e6fb

docker_pull(
name = "debian-hyperkube-base-amd64",
digest = "sha256:e45d35f9f967ef7d49496d1d2e6f9ad378a29012b0c90f78b5d59a254f3135e6",
registry = "gcr.io",
repository = "google-containers/debian-hyperkube-base-amd64",
tag = "0.3", # ignored, but kept here for documentation
)
.

I just pushed gcr.io/google-containers/debian-hyperkube-base-amd64:0.4, and its digest is sha256:f3a37c4d8700a5ff454d94a2bef7d165d287759cea737a621c20e4aa3891dbbb.

@edevil
Copy link
Contributor Author

edevil commented Oct 12, 2017

@ixdy Done.

@k8s-ci-robot k8s-ci-robot removed the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 12, 2017
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

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 k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 12, 2017
@ixdy
Copy link
Contributor

ixdy commented Oct 12, 2017

@edevil did you use the wrong email address on that last commit? the CLA bot doesn't seem to like it.

@edevil
Copy link
Contributor Author

edevil commented Oct 12, 2017

@ixdy Hum, I don't think so. Both commits have the same e-mail, and it is associated with my GH account. In fact the bot removed but then added back the "cncf-cla:yes" label.

@ericchiang ericchiang mentioned this pull request Oct 12, 2017
Merged
@ericchiang
Copy link
Contributor

Tests are failing with:

I1012 15:57:15.370] Automatic merge failed; fix conflicts and then commit the result.

Looks like there's a merge conflict? Odd cause the bot doesn't indicate that this PR needs rebasing.

@rphillips
Copy link
Member

might be with the build/root/WORKSPACE file... When I rebased the cherrypick there was a conflict there.

@edevil
Copy link
Contributor Author

edevil commented Oct 12, 2017

I've rebased the branch, but found no conflicts.

@rphillips
Copy link
Member

/test pull-kubernetes-e2e-gce-bazel

@ixdy
Copy link
Contributor

ixdy commented Oct 12, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, edevil, ixdy

Associated issue: 53396

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

@ixdy
Copy link
Contributor

ixdy commented Oct 13, 2017

/test pull-kubernetes-unit

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 9af47db into kubernetes:master Oct 13, 2017
@edevil edevil mentioned this pull request Oct 13, 2017
Merged
@ixdy ixdy mentioned this pull request Oct 20, 2017
Merged
@jpbetz jpbetz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherrypick-candidate labels Oct 25, 2017
k8s-github-robot pushed a commit that referenced this pull request Oct 26, 2017
Merge pull request #53871 from edevil/automated-cherry-pick-of-#53642…
5cd0f9a 
…-kube-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #53642

Cherry pick of #53642 on release-1.8.

#53642: Ensure base image includes the modprobe binary

```release-note
Adds modprobe back into the hyperkube image. 
```
k8s-github-robot referenced this pull request Nov 2, 2017
Merge pull request #54325 from ixdy/automated-cherry-pick-of-#53642-#…
0ce7d53 
…54250-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #54250

Cherry pick of #54250 on release-1.8.

#54250: Add openssh-client to the debian-hyperkube-base image

```release-note
Adds modprobe and openssh-client back into the hyperkube image. 
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jbeda jbeda

@cblecker cblecker

@dchen1107 dchen1107

@ixdy ixdy

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-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

Kubelet v1.8.0 breaks pods talking to services on the same node