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.

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

Automated cherry pick of #31367 #35455

Merged
merged 1 commit into from
Oct 31, 2016
Merged

Automated cherry pick of #31367 #35455

merged 1 commit into from
Oct 31, 2016

Conversation

maisem
Copy link

@maisem maisem commented Oct 24, 2016 •
edited by k8s-oncall
Loading

Cherry pick of #31367 on release-1.3.
#31367: gci: decouple from the built-in kubelet version

This change is Reviewable

@Amey-D
gci: decouple from the built-in kubelet version
e7fb1af 
Prior to this change, configure.sh would:
(1) compare versions of built-in kubelet and downloaded kubelet, and
(2) bind-mount downloaded kubelet at /usr/bin/kubelet in case of
version mismatch

With this change, configure.sh:
(1) compares the two versions only on test clusters, and
(2) uses the actual file paths to start kubelet w/o any bind-mounting

To allow (2), this change also provides its own version of kubelet
systemd service file.

Effectively with this change we will always use the downloaded kubelet
binary along with its own systemd service file on non-test clusters.  The
main advantage is this change does not rely on the kubelet being built in to
the OS image.
@maisem maisem added this to the v1.3 milestone Oct 24, 2016
@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Oct 24, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit e7fb1af. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins Kubemark GCE e2e failed for commit e7fb1af. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GCE e2e failed for commit e7fb1af. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@wonderfly
Copy link
Contributor

LGTM as long as the tests are green. Since this is an automatic cherrypick, I don't think I'll be able to spot a bug.

@jessfraz
Copy link
Contributor

does this also need to be cherrypicked onto 1.4?

@maisem
Copy link
Author

maisem commented Oct 24, 2016

@jessfraz - No, this already exists in 1.4.

@fabioy
Copy link
Contributor

fabioy commented Oct 24, 2016

@k8s-bot gci gce e2e test this

@jessfraz
Copy link
Contributor

@maisem great thanks!

@fabioy fabioy added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Oct 24, 2016
@fabioy
Copy link
Contributor

fabioy commented Oct 24, 2016

@k8s-bot gci gke e2e test this

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit e7fb1af. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@fabioy
Copy link
Contributor

fabioy commented Oct 31, 2016

@k8s-bot cvm gke e2e test this

@fabioy
Copy link
Contributor

fabioy commented Oct 31, 2016

@k8s-bot gci gke e2e test this

@fabioy fabioy added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Oct 31, 2016
@fabioy fabioy merged commit 2601926 into kubernetes:release-1.3 Oct 31, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@fabioy
Merge pull request kubernetes#35455 from maisem/automated-cherry-pick…
83391a5 
…-of-#31367-upstream-release-1.3

Automated cherry pick of kubernetes#31367
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fabioy fabioy

@wonderfly wonderfly

@adityakali adityakali

@Amey-D Amey-D

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
10 participants
@maisem @k8s-github-robot @k8s-ci-robot @wonderfly @jessfraz @fabioy @k8s-cherrypick-bot @googlebot @adityakali @Amey-D