Kubernetes Submit Queue 9385d50100 Merge pull request #47345 from luxas/kubeadm_move_controlplane_phase ... Automatic merge from submit-queue (batch tested with PRs 46928, 47345) kubeadm: Move directory ./master to ./phases/controlplane **What this PR does / why we need it**: - Moves app/master into phases/controlplane. It should be in the phases directory, was just overlooked earlier - Harmonizes the import names in phases/controlplane with the similar import names in cmd/kubeadm **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Please review only second and third commit, based on https://github.com/kubernetes/kubernetes/pull/47339 Targets v1.8 **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @timothysc @pipejakob		2017-07-04 04:37:31 -07:00
..
apis/kubeadm	Merge pull request #48056 from luxas/kubeadm_remove_old_label	2017-06-30 22:06:23 -07:00
cmd	kubeadm: Move app/master into a separate phase directory	2017-07-04 12:30:42 +03:00
constants	kubeadm: Remove old feature gates and unused functions	2017-06-30 17:46:34 +03:00
discovery	run hack/update-all	2017-06-22 11:31:03 -07:00
images	Release 3.0.17 etcd image	2017-02-27 16:23:44 +01:00
node	run hack/update-all	2017-06-22 11:31:03 -07:00
phases	kubeadm: Harmonize import names in the controlplane phase with all the other code	2017-07-04 12:31:46 +03:00
preflight	Add "alpha phase preflight" command	2017-06-20 16:14:06 -03:00
util	kubeadm: Move app/master into a separate phase directory	2017-07-04 12:30:42 +03:00
BUILD	kubeadm: Move app/master into a separate phase directory	2017-07-04 12:30:42 +03:00
kubeadm.go	Refactor the whole binary, a lot of changes in one commit I know, but I just hacked on this and modified everything I thought was messy or could be done better.	2016-12-09 12:48:12 +02:00