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

Create a new Deployment in kube-system for every version. #23512

Merged
merged 1 commit into from
Mar 30, 2016

Conversation

Q-Lee
Copy link
Contributor

@Q-Lee Q-Lee commented Mar 25, 2016

It appears that version numbers have already been properly added to these files. Small change to delete an old deployment entirely, so we can make a new one per version (like replication controllers).

We'll want to change this back once the kube-addons support deployments in a later version.

@Q-Lee
Copy link
Contributor Author

Q-Lee commented Mar 25, 2016

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 25, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 26, 2016

GCE e2e build/test passed for commit 4c973ecaaa0740bdc7fdf1e915d3a2ff3b6dd875.

@@ -25,7 +25,6 @@ spec:
metadata:
labels:
Copy link
Member

Choose a reason for hiding this comment

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

These need a version label or two deployments will select the same set of replicasets

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ack.

Choose a reason for hiding this comment

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

@mikedanese, I noticed your comment "need a version label or two deployments will select the same set of replicasets". This is news to me, but I'm a novice so am probably confused. Could you spare a moment explain this concern in more detail, or point me to some relevant docs? Thanks.

@mikedanese
Copy link
Member

I think we should rename deployment names from heapster-v1.1.0-beta1 to heapster-v1.1.0.beta1 for compatibility with get-suffix. Otherwise the addon creater will think the name of the addon is actually heapster-v1.1.0 which may pose some issues.

@Q-Lee
Copy link
Contributor Author

Q-Lee commented Mar 28, 2016

Fair point about get-suffix.

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 28, 2016
@mikedanese
Copy link
Member

Thanks. This looks good to me. @fgrzadkowski I think this fixes #23471. WDYT?

@k8s-bot
Copy link

k8s-bot commented Mar 28, 2016

GCE e2e build/test failed for commit aa94464e68c02ee6f53a50ff4bea4b89ebb53402.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-bot
Copy link

k8s-bot commented Mar 29, 2016

GCE e2e build/test passed for commit 7f4487b21c5c73964a4a189f20ed3dbce5225471.

@mikedanese mikedanese added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Mar 29, 2016
template:
metadata:
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta
Copy link
Member

Choose a reason for hiding this comment

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

The version labels don't match the controller name. Was that intentional? It's like this in a few spots.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I just hadn't tested all 4 configs yet.

@mikedanese
Copy link
Member

One last comment then I will apply LGTM.

@mikedanese
Copy link
Member

LGTM

@mikedanese mikedanese added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 29, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 29, 2016

GCE e2e build/test passed for commit 0dcd49d.

@Q-Lee
Copy link
Contributor Author

Q-Lee commented Mar 29, 2016

Flaky test: #23610

@Q-Lee
Copy link
Contributor Author

Q-Lee commented Mar 29, 2016

@k8s-bot test this issue: #23610

@mikedanese mikedanese added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Mar 29, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 30, 2016

GCE e2e build/test passed for commit 0dcd49d.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 30, 2016

GCE e2e build/test passed for commit 0dcd49d.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 30, 2016

GCE e2e build/test passed for commit 0dcd49d.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 30, 2016

GCE e2e build/test passed for commit 0dcd49d.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c327879 into kubernetes:master Mar 30, 2016
@piosz
Copy link
Member

piosz commented Mar 31, 2016

LGTM. Thanks for doing this.

My only concern here is that there is no profit from using Deployment instead of Replication Controller because we are removing and creating the deployment object during each update. We should use Deployment upgrade feature instead of this but it requires significant change in the kube-addon upgrade script.

template:
metadata:
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
Copy link
Member

Choose a reason for hiding this comment

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

With this label removed from the pods and replica sets, what will delete them when the version is upgraded in the future?

Copy link
Member

Choose a reason for hiding this comment

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

Addon updater uses kubectl stop.

@bgrant0607
Copy link
Member

The addon-resizer doesn't fight with the addon-updater?

@mikedanese
Copy link
Member

@piosz I agree that we should be using deployment rolling updates between versions of addons. The reason we need deployments for this addon today is the resizer directly modifies the deployment to adjust resource requirements in the pod spec and relies on the rolling update. This wouldn't work if we were using replication controller.

@bgrant0607 we only update when the name changes. We don't look for modifications of the spec. So they shouldn't fight.

@bgrant0607 bgrant0607 added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 5, 2016
@roberthbailey
Copy link
Contributor

@Q-Lee -- can you create a cherry pick PR for this change on the release-1.2 branch?

See https://github.com/kubernetes/kubernetes/blob/master/docs/devel/cherry-picks.md#how-do-cherrypick-candidates-make-it-to-the-release-branch

@janetkuo
Copy link
Member

janetkuo commented Apr 6, 2016

We'll need to cherry pick #22893 too

@zmerlynn zmerlynn added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Apr 6, 2016
zmerlynn added a commit that referenced this pull request Apr 6, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" 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
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Jul 31, 2019
UPSTREAM: 78883: Fix incorrect procMount defaulting

Origin-commit: 62c1be4dbd78bdab64685bd8bdc119e0463af3c3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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
Development

Successfully merging this pull request may close these issues.

None yet