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

Bump kube-addon-manager to v5.1.1 #42842

Merged
merged 1 commit into from
Mar 14, 2017
Merged

Bump kube-addon-manager to v5.1.1 #42842

merged 1 commit into from
Mar 14, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Mar 9, 2017 •
edited
Loading

What this PR does / why we need it: the kube-addon-manager:v5.1 image is pretty old (July 4 2016) and should be rebased on a newer version of its base image, python:2.7-slim. This PR just bumps the tag with no other code changes; pushing this image should rebase it on the latest python:2.7-slim image with no other changes.

Special notes for your reviewer:
Alternately, we could look into upgrading the 1.4 branch to a newer version of kube-addon-manager, ideally one which doesn't depend on python. That's probably a bit riskier of a change, though. cc @MrHohn to comment.

Release note:

Updates base image used for `kube-addon-manager` to latest `python:2.7-slim` and embedded `kubectl` to `v1.3.10`. No functionality changes expected.

cc @timstclair

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 9, 2017
@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 9, 2017
@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

I have not yet pushed v5.1.1.

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

The KUBECTL_VERSION?=v1.3.0-beta.2 lines are also unfortunate, but I'm not sure if we want to change these now.

@k8s-reviewable
Copy link

This change is Reviewable

@MrHohn
Copy link
Member

MrHohn commented Mar 9, 2017 •
edited
Loading

The newest addon-manager version we could use in 1.4 branch would be v5.2, though it only added support for ConfigMap and nothing else. Since v6.0, addon-manager does not depend on python anymore, but it instead depends on the kubectl apply --prune feature in v1.5 kubectl.

Ref: changelog

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

Thanks @MrHohn. v5.2 was built in October but would need to be rebased, too.
It looks like v5.2 removed the use of python (0e4e54a) and bumped the embedded kubectl to 1.5.0-beta.1 (c956b5b), though the base image remained python until v6.0.

Given that, rebasing the v5.1 image is probably the least risky option for the 1.4 branch.

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

I think the changelog is wrong; kubectl was never 1.4 in this image. :\

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

wait, what?

$ docker run -ti --rm --entrypoint kubectl gcr.io/google-containers/kube-addon-manager:v5.2 version --client
Client Version: version.Info{Major:"1", Minor:"4", GitVersion:"v1.4.4", GitCommit:"3b417cc4ccd1b8f38ff9ec96bb50a81ca0ea9d56", GitTreeState:"clean", BuildDate:"2016-10-21T02:48:38Z", GoVersion:"go1.6.3", Compiler:"gc", Platform:"linux/amd64"}

oh: #35255 (comment)

@MrHohn
Copy link
Member

MrHohn commented Mar 9, 2017

It looks like v5.2 removed the use of python (0e4e54a) and bumped the embedded kubectl to 1.5.0-beta.1 (c956b5b), though the base image remained python until v6.0.

Things are a bit tricky here...I updated the script before kubectl apply --prune was completely ready for addon-manager. And in between, due to some blocking issue in #35255, I pushed the new images with the old scripts and v1.4.4 kubectl binary :(

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

yeah, this just convinces me more that we probably shouldn't use v5.2 - it seems like it'd be difficult to rebase it properly.

@MrHohn
Copy link
Member

MrHohn commented Mar 9, 2017

Totally agree, v5.1 seems to be the one :)

@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

ok, I'm gonna build and push a v5.1.1 image then (as defined in this PR).

@ixdy ixdy force-pushed the 1.4-kube-addon-manager-v5.1.1 branch from 4a846b8 to 92427fc Compare March 9, 2017 23:42
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 9, 2017
@ixdy
Copy link
Member Author

ixdy commented Mar 9, 2017

I am bumping the embedded kubectl to v1.3.10, though - should be functionally the same, but it makes me feel better, since it probably has some bugfixes.

@mikedanese
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: ixdy, mikedanese

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

We suggest the following people:
cc
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 Mar 14, 2017
@mikedanese mikedanese added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 14, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 14, 2017
@jessfraz jessfraz added this to the v1.4 milestone Mar 14, 2017
@jessfraz jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 14, 2017
@jessfraz jessfraz added cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 14, 2017
@jessfraz
Copy link
Contributor

@k8s-bot test this

@jessfraz
Copy link
Contributor

merging since all green

@jessfraz jessfraz merged commit 0c9c5d6 into kubernetes:release-1.4 Mar 14, 2017
@k8s-cherrypick-bot
Copy link

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

@jessfraz jessfraz mentioned this pull request Mar 23, 2017
Closed
@ixdy ixdy deleted the 1.4-kube-addon-manager-v5.1.1 branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jessfraz jessfraz

@MrHohn MrHohn

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@ixdy @k8s-reviewable @MrHohn @mikedanese @k8s-github-robot @jessfraz @k8s-cherrypick-bot @k8s-ci-robot