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

Move hyperkube symlink creation to base image and re-enable building of conformance image #69832

Merged
merged 3 commits into from
Oct 17, 2018

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Oct 15, 2018

What this PR does / why we need it: currently when building the conformance and hyperkube images, we call docker run --rm --privileged multiarch/qemu-user-static:register --reset to register the qemu handlers, as we run non-x86 binaries inside the Dockerfiles.

This really isn't that necessary, however:

  • for hyperkube, we're just creating some symlinks
  • for conformance, we aren't even running any commands. It's just a result of copy-pasting the Dockerfile from hyperkube.

I've moved the symlink creation to the hyperkube base image, which prevents us from needing to run this at build time, and thus from needing to run the privileged container at all.

The only negative side effect of this is that the conformance image has some dangling symlinks to the nonexistent hyperkube binary. But it probably shouldn't be using the hyperkube image, anyway...

I've also updated the hyperkube symlinks, adding the missing cloud-controller-manager symlink and removing the deprecated aggregator symlink.

This probably doesn't break anything, but with hyperkube, you never really know.

I haven't promoted the new hyperkube base image yet, so this will fail builds. If we think this approach looks reasonable, I'll work on promoting the image.

Release note:

NONE

/assign @cblecker @dims @BenTheElder @mkumatag @AishSundar

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 15, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ixdy

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

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 15, 2018
@k8s-ci-robot k8s-ci-robot added 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. release-note-none Denotes a PR that doesn't merit a release note. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. 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 15, 2018
@ixdy
Copy link
Member Author

ixdy commented Oct 15, 2018

this also re-enables building the conformance image.

@AishSundar
Copy link
Contributor

AishSundar commented Oct 15, 2018

@timothysc and @dougm as FYI

@k8s-ci-robot
Copy link
Contributor

@AishSundar: GitHub didn't allow me to request PR reviews from the following users: and, as, FYI.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @timothysc and @dougm as FYI

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.

@ixdy
Copy link
Member Author

ixdy commented Oct 16, 2018

/retest

@dims
Copy link
Member

dims commented Oct 16, 2018

/kind cleanup
/lgtm
/hold

(please remove hold when you think this is ready)

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 16, 2018
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 16, 2018
@ixdy ixdy changed the title Move hyperkube symlink creation to base image to prevent needing to register qemu handlers at build time Move hyperkube symlink creation to base image and re-enable building of conformance image Oct 16, 2018
@ixdy
Copy link
Member Author

ixdy commented Oct 16, 2018

/hold cancel
PTAL

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 16, 2018
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/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 16, 2018
@ixdy
Copy link
Member Author

ixdy commented Oct 16, 2018

flake, I think?
/retest

@dims
Copy link
Member

dims commented Oct 16, 2018

/test pull-kubernetes-node-e2e

@k8s-ci-robot k8s-ci-robot merged commit a630801 into kubernetes:master Oct 17, 2018
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. 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. release-note-none Denotes a PR that doesn't merit a release note. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants