Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

fix: extract kubelet and kubectl binaries from hyperkube's binary folder when possible #2298

Merged
merged 2 commits into from Nov 12, 2019
Merged

Conversation

chewong
Copy link

@chewong chewong commented Nov 11, 2019

Reason for Change:

With kubernetes/kubernetes#84662, we can no longer obtain kubelet and kubectl binaries by renaming the hyperkube binary. Instead, we should extract them through hyperkube's binary folder when possible.

Issue Fixed:

Requirements:

Notes:

@acs-bot acs-bot added the size/M label Nov 11, 2019
@mboersma
Copy link
Member

See also #2191, which is necessary for 1.17.0-alpha.2 and later, but is currently blocked until #2161 merges.

@chewong
Copy link
Author

chewong commented Nov 11, 2019

@mboersma thanks for the info. Are we still planning to support customHyperkubeImage after when provided?

@mboersma
Copy link
Member

Are we still planning to support customHyperkubeImage...?

It's a good question, since there is no official hyperkube image for 1.17 onward. I guess the most backward-compatible decision would be to continue to honor customHyperkubeImage regardless, so if the user actually builds a custom 1.17.x hyperkube image that will still work.

@acs-bot acs-bot added size/S and removed size/M labels Nov 11, 2019
@codecov
Copy link

codecov bot commented Nov 11, 2019

Codecov Report

Merging #2298 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #2298   +/-   ##
=======================================
  Coverage   71.61%   71.61%           
=======================================
  Files         142      142           
  Lines       24760    24760           
=======================================
  Hits        17731    17731           
  Misses       5901     5901           
  Partials     1128     1128

@jackfrancis
Copy link
Member

Just to insert myself where I wasn't invited... we should continue to support hyperkube images (including "bring your own hyperkube") indefinitely.

@mboersma
Copy link
Member

@chewong since there isn't a hyperkube for 1.17 (except 1.17.0-alpha.1), is this a useful change?

@chewong
Copy link
Author

chewong commented Nov 11, 2019

@chewong since there isn't a hyperkube for 1.17 (except 1.17.0-alpha.1), is this a useful change?

We could still build a hyperkube image in 1.17 using this Dockerfile after building component binaries in k8s/k8s. This PR accounts for the new hyperkube introduced by kubernetes/kubernetes#84662. However, the long term solution is to move away from building hyperkube in k8s/test-infra and build individual components instead.

@mboersma
Copy link
Member

Thanks for the explanation. If this helps with upstream testing even temporarily, that's important.

Copy link
Member

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm

@acs-bot
Copy link

acs-bot commented Nov 12, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chewong, mboersma

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

@acs-bot acs-bot merged commit 975af62 into Azure:master Nov 12, 2019
@chewong chewong deleted the hyperkube-fix branch November 12, 2019 19:34
@jackfrancis jackfrancis added this to the v0.44.0 milestone Nov 20, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants