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

Automated cherry pick of #50320 #50393

Conversation

luxas
Copy link
Member

@luxas luxas commented Aug 9, 2017

Cherry pick of #50320 on release-1.7.

#50320: kubeadm: Upload configuration used at 'kubeadm init' time

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 9, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luxas

Associated issue: 50320

The full list of commands accepted by this bot can be found here.

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

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 9, 2017
@luxas luxas added this to the v1.7 milestone Aug 9, 2017
@timothysc
Copy link
Member

So you're treading in weird territory here. You're backporting a new feature.

That requires further explanation as to why.

@luxas
Copy link
Member Author

luxas commented Aug 9, 2017

@timothysc I thought we had discussed this a couple of times.
If we decide to not do this, it's fine for me, but my interpretation from the earlier sig calls where this has been discussed was that this is something we want to do for better UX.

So this makes the upgrade from v1.7.4->v1.8 much easier as the user doesn't have to create a configuration file in their own to feed kubeadm upgrade with. Instead this is handled just out of the box, as kubeadm upgrade can just read what the previous config were and can adopt to that.

cc @kubernetes/sig-cluster-lifecycle-pr-reviews
Do we want to enhance the UX in this way with regards to upgrading or should we leave this as-is?

@k8s-ci-robot k8s-ci-robot added the sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. label Aug 9, 2017
@timothysc
Copy link
Member

I'm calling it out for the release manager to weigh in.

Dunno what if/any formal policy we have here, also it would be weird in that it would only affect 1.7.x and > vs all of 1.7 .

@luxas
Copy link
Member Author

luxas commented Aug 9, 2017

cc @roberthbailey @jbeda WDYT?

cc @wojtek-t as the branch manager

@pipejakob
Copy link
Contributor

Just to give the branch manager more context, this isn't fixing a bug, but is improving the future upgrade story for kubeadm-initialized clusters.

Without this cherry-pick, our upgrade directions will look like:

If you initialized your cluster with kubeadm < 1.8, follow steps A to upgrade it.

If you initialized your cluster with kubeadm >= 1.8, follow steps B to upgrade it.

With this cherry-pick, we'll still have the same directions, but with different version boundaries:

If you initialized your cluster with kubeadm < 1.7.4, follow steps A to upgrade it.

If you initialized your cluster with kubeadm >= 1.7.4, follow steps B to upgrade it.

The actual steps in process A are more tedious and error-prone than B, and were a stopgap implementation when process B wasn't ready in time for the 1.7 release. Process B should be a lot friendlier to users and more fool-proof, so this cherry-pick is targeting being able to get users on the B train even earlier than the 1.8 release.

Is that a fair synopsis, @luxas?

@wojtek-t
Copy link
Member

I don't think I should be making this decision.
@roberthbailey - WDYT?

@roberthbailey
Copy link
Contributor

You are the branch manager, so you should be making the ultimate decision. :)

@roberthbailey
Copy link
Contributor

@luxas -- you say

this makes the upgrade from v1.7.4->v1.8 much easier

But it doesn't help the upgrade from 1.7.x->1.7.4+ or 1.7.x (x<4) to 1.8.

@wojtek-t
Copy link
Member

@roberthbailey - I know that I'm decision maker, but I would like to get your recommendation as you're the SIG lead.

@roberthbailey
Copy link
Contributor

roberthbailey commented Aug 10, 2017

Here's a good thought experiment: If kubeadm was in it's own repository, would we add this change for deploying 1.7 clusters or wait and add it for 1.8 and above? Based on the way that we make changes to GKE, I'm inclined to say the former.

Since this cherry pick is isolated to kubeadm code (which is technically not part of the nucleus even though it's in the main repo) I don't have a problem back porting this change.

@wojtek-t
Copy link
Member

OK- I approve the cherrypick.

Can someone please lgtm it?

@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Aug 11, 2017
@roberthbailey
Copy link
Contributor

@timothysc and @pipejakob lgtm'd the original PR so they would be appropriate to take a look here if you want an extra set of eyes.

@wojtek-t
Copy link
Member

@luxas - verify failure is a real one. Please fix.

@luxas luxas force-pushed the automated-cherry-pick-of-#50320-upstream-release-1.7 branch from ecff0e3 to b9ea28a Compare August 14, 2017 12:18
@k8s-github-robot k8s-github-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 14, 2017
@luxas
Copy link
Member Author

luxas commented Aug 14, 2017

/retest

@timothysc
Copy link
Member

This is a weird policy thing we should bring up in the meeting. I'm ok if the SIG is ok with it, but it should be more of an exception then the norm.

@luxas
Copy link
Member Author

luxas commented Aug 14, 2017

Agreed; let's discuss this tomorrow

@pipejakob
Copy link
Contributor

LGTM, based on the original PR. Since we're discussing in the SIG meeting tomorrow, I'll hold off from adding the label now to keep this out of the submit queue.

@luxas
Copy link
Member Author

luxas commented Aug 15, 2017

We decided in the SIG Meeting to not go with this approach for now

@luxas luxas closed this Aug 15, 2017
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.