Merge pull request #47345 from luxas/kubeadm_move_controlplane_phase

build/visible_to/BUILD

@@ -72,7 +72,7 @@ package_group(
     packages = [
         "//cmd/kubeadm/app",
         "//cmd/kubeadm/app/cmd",
-        "//cmd/kubeadm/app/master",
+        "//cmd/kubeadm/app/phases/controlplane",
     ],
 )
 

cmd/kubeadm/app/BUILD

@@ -35,11 +35,11 @@ filegroup(
         "//cmd/kubeadm/app/constants:all-srcs",
         "//cmd/kubeadm/app/discovery:all-srcs",
         "//cmd/kubeadm/app/images:all-srcs",
-        "//cmd/kubeadm/app/master:all-srcs",
         "//cmd/kubeadm/app/node:all-srcs",
         "//cmd/kubeadm/app/phases/addons:all-srcs",
         "//cmd/kubeadm/app/phases/apiconfig:all-srcs",
         "//cmd/kubeadm/app/phases/certs:all-srcs",
+        "//cmd/kubeadm/app/phases/controlplane:all-srcs",
         "//cmd/kubeadm/app/phases/kubeconfig:all-srcs",
         "//cmd/kubeadm/app/phases/token:all-srcs",
         "//cmd/kubeadm/app/preflight:all-srcs",

cmd/kubeadm/app/cmd/BUILD

@@ -28,11 +28,11 @@ go_library(
         "//cmd/kubeadm/app/cmd/phases:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
         "//cmd/kubeadm/app/discovery:go_default_library",
-        "//cmd/kubeadm/app/master:go_default_library",
         "//cmd/kubeadm/app/node:go_default_library",
         "//cmd/kubeadm/app/phases/addons:go_default_library",
         "//cmd/kubeadm/app/phases/apiconfig:go_default_library",
         "//cmd/kubeadm/app/phases/certs:go_default_library",
+        "//cmd/kubeadm/app/phases/controlplane:go_default_library",
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/phases/token:go_default_library",
         "//cmd/kubeadm/app/preflight:go_default_library",

cmd/kubeadm/app/cmd/init.go

@@ -32,10 +32,10 @@ import (
 	kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	kubemaster "k8s.io/kubernetes/cmd/kubeadm/app/master"
 	addonsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons"
 	apiconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/apiconfig"
 	certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
+	controlplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane"
 	kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig"
 	tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/token"
 	"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
@@ -211,12 +211,12 @@ func (i *Init) Run(out io.Writer) error {
 	}
 
 	// PHASE 3: Bootstrap the control plane
-	if err := kubemaster.WriteStaticPodManifests(i.cfg); err != nil {
+	if err := controlplanephase.WriteStaticPodManifests(i.cfg); err != nil {
 		return err
 	}
 
 	adminKubeConfigPath := filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeadmconstants.AdminKubeConfigFileName)
-	client, err := kubemaster.CreateClientAndWaitForAPI(adminKubeConfigPath)
+	client, err := kubeadmutil.CreateClientAndWaitForAPI(adminKubeConfigPath)
 	if err != nil {
 		return err
 	}
@@ -225,16 +225,6 @@ func (i *Init) Run(out io.Writer) error {
 		return err
 	}
 
-	// Is deployment type self-hosted?
-	if i.cfg.SelfHosted {
-		// Temporary control plane is up, now we create our self hosted control
-		// plane components and remove the static manifests:
-		fmt.Println("[self-hosted] Creating self-hosted control plane...")
-		if err := kubemaster.CreateSelfHostedControlPlane(i.cfg, client); err != nil {
-			return err
-		}
-	}
-
 	// PHASE 4: Set up the bootstrap tokens
 	if !i.skipTokenPrint {
 		fmt.Printf("[token] Using token: %s\n", i.cfg.Token)
@@ -271,6 +261,16 @@ func (i *Init) Run(out io.Writer) error {
 		return err
 	}
 
+	// Is deployment type self-hosted?
+	if i.cfg.SelfHosted {
+		// Temporary control plane is up, now we create our self hosted control
+		// plane components and remove the static manifests:
+		fmt.Println("[self-hosted] Creating self-hosted control plane...")
+		if err := controlplanephase.CreateSelfHostedControlPlane(i.cfg, client); err != nil {
+			return err
+		}
+	}
+
 	ctx := map[string]string{
 		"KubeConfigPath": filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeadmconstants.AdminKubeConfigFileName),
 		"KubeConfigName": kubeadmconstants.AdminKubeConfigFileName,

cmd/kubeadm/app/master/BUILD → cmd/kubeadm/app/phases/controlplane/BUILD

@@ -8,10 +8,24 @@ load(
     "go_test",
 )
 
+go_test(
+    name = "go_default_test",
+    srcs = ["manifests_test.go"],
+    library = ":go_default_library",
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
+        "//cmd/kubeadm/app/constants:go_default_library",
+        "//pkg/util/version:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
+    ],
+)
+
 go_library(
     name = "go_default_library",
     srcs = [
-        "apiclient.go",
         "manifests.go",
         "selfhosted.go",
     ],
@@ -21,7 +35,7 @@ go_library(
         "//cmd/kubeadm/app/apis/kubeadm/v1alpha1:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
         "//cmd/kubeadm/app/images:go_default_library",
-        "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
+        "//cmd/kubeadm/app/util:go_default_library",
         "//pkg/kubeapiserver/authorizer/modes:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/kubelet/types:go_default_library",
@@ -38,21 +52,6 @@ go_library(
     ],
 )
 
-go_test(
-    name = "go_default_test",
-    srcs = ["manifests_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
-        "//cmd/kubeadm/app/constants:go_default_library",
-        "//pkg/util/version:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
-    ],
-)
-
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),

cmd/kubeadm/app/master/manifests_test.go → cmd/kubeadm/app/phases/controlplane/manifests_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"fmt"
@@ -25,7 +25,7 @@ import (
 	"sort"
 	"testing"
 
-	api "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
@@ -93,7 +93,7 @@ func TestWriteStaticPodManifests(t *testing.T) {
 			}
 			defer manifest.Close()
 
-			var pod api.Pod
+			var pod v1.Pod
 			d := yaml.NewYAMLOrJSONDecoder(manifest, 4096)
 			if err := d.Decode(&pod); err != nil {
 				t.Error("WriteStaticPodManifests: error decoding manifests/kube-apiserver.yaml into Pod")
@@ -131,15 +131,15 @@ func TestNewVolume(t *testing.T) {
 	var tests = []struct {
 		name     string
 		path     string
-		expected api.Volume
+		expected v1.Volume
 	}{
 		{
 			name: "foo",
 			path: "/etc/foo",
-			expected: api.Volume{
+			expected: v1.Volume{
 				Name: "foo",
-				VolumeSource: api.VolumeSource{
-					HostPath: &api.HostPathVolumeSource{Path: "/etc/foo"},
+				VolumeSource: v1.VolumeSource{
+					HostPath: &v1.HostPathVolumeSource{Path: "/etc/foo"},
 				}},
 		},
 	}
@@ -167,12 +167,12 @@ func TestNewVolumeMount(t *testing.T) {
 	var tests = []struct {
 		name     string
 		path     string
-		expected api.VolumeMount
+		expected v1.VolumeMount
 	}{
 		{
 			name: "foo",
 			path: "/etc/foo",
-			expected: api.VolumeMount{
+			expected: v1.VolumeMount{
 				Name:      "foo",
 				MountPath: "/etc/foo",
 			},
@@ -201,16 +201,16 @@ func TestNewVolumeMount(t *testing.T) {
 func TestEtcdVolume(t *testing.T) {
 	var tests = []struct {
 		cfg      *kubeadmapi.MasterConfiguration
-		expected api.Volume
+		expected v1.Volume
 	}{
 		{
 			cfg: &kubeadmapi.MasterConfiguration{
 				Etcd: kubeadmapi.Etcd{DataDir: etcdDataDir},
 			},
-			expected: api.Volume{
+			expected: v1.Volume{
 				Name: "etcd",
-				VolumeSource: api.VolumeSource{
-					HostPath: &api.HostPathVolumeSource{Path: etcdDataDir},
+				VolumeSource: v1.VolumeSource{
+					HostPath: &v1.HostPathVolumeSource{Path: etcdDataDir},
 				}},
 		},
 	}
@@ -236,10 +236,10 @@ func TestEtcdVolume(t *testing.T) {
 
 func TestEtcdVolumeMount(t *testing.T) {
 	var tests = []struct {
-		expected api.VolumeMount
+		expected v1.VolumeMount
 	}{
 		{
-			expected: api.VolumeMount{
+			expected: v1.VolumeMount{
 				Name:      "etcd",
 				MountPath: etcdDataDir,
 			},
@@ -268,14 +268,14 @@ func TestEtcdVolumeMount(t *testing.T) {
 func TestCertsVolume(t *testing.T) {
 	var tests = []struct {
 		cfg      *kubeadmapi.MasterConfiguration
-		expected api.Volume
+		expected v1.Volume
 	}{
 		{
 			cfg: &kubeadmapi.MasterConfiguration{},
-			expected: api.Volume{
+			expected: v1.Volume{
 				Name: "certs",
-				VolumeSource: api.VolumeSource{
-					HostPath: &api.HostPathVolumeSource{
+				VolumeSource: v1.VolumeSource{
+					HostPath: &v1.HostPathVolumeSource{
 						Path: "/etc/ssl/certs"},
 				}},
 		},
@@ -302,10 +302,10 @@ func TestCertsVolume(t *testing.T) {
 
 func TestCertsVolumeMount(t *testing.T) {
 	var tests = []struct {
-		expected api.VolumeMount
+		expected v1.VolumeMount
 	}{
 		{
-			expected: api.VolumeMount{
+			expected: v1.VolumeMount{
 				Name:      "certs",
 				MountPath: "/etc/ssl/certs",
 			},
@@ -333,13 +333,13 @@ func TestCertsVolumeMount(t *testing.T) {
 
 func TestK8sVolume(t *testing.T) {
 	var tests = []struct {
-		expected api.Volume
+		expected v1.Volume
 	}{
 		{
-			expected: api.Volume{
+			expected: v1.Volume{
 				Name: "k8s",
-				VolumeSource: api.VolumeSource{
-					HostPath: &api.HostPathVolumeSource{
+				VolumeSource: v1.VolumeSource{
+					HostPath: &v1.HostPathVolumeSource{
 						Path: kubeadmapi.GlobalEnvParams.KubernetesDir},
 				}},
 		},
@@ -366,10 +366,10 @@ func TestK8sVolume(t *testing.T) {
 
 func TestK8sVolumeMount(t *testing.T) {
 	var tests = []struct {
-		expected api.VolumeMount
+		expected v1.VolumeMount
 	}{
 		{
-			expected: api.VolumeMount{
+			expected: v1.VolumeMount{
 				Name:      "k8s",
 				MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
 				ReadOnly:  true,
@@ -416,17 +416,17 @@ func TestComponentProbe(t *testing.T) {
 	var tests = []struct {
 		port   int
 		path   string
-		scheme api.URIScheme
+		scheme v1.URIScheme
 	}{
 		{
 			port:   1,
 			path:   "foo",
-			scheme: api.URISchemeHTTP,
+			scheme: v1.URISchemeHTTP,
 		},
 		{
 			port:   2,
 			path:   "bar",
-			scheme: api.URISchemeHTTPS,
+			scheme: v1.URISchemeHTTPS,
 		},
 	}
 	for _, rt := range tests {
@@ -465,8 +465,8 @@ func TestComponentPod(t *testing.T) {
 	}
 
 	for _, rt := range tests {
-		c := api.Container{Name: rt.n}
-		v := api.Volume{}
+		c := v1.Container{Name: rt.n}
+		v := v1.Volume{}
 		actual := componentPod(c, v)
 		if actual.ObjectMeta.Name != rt.n {
 			t.Errorf(

cmd/kubeadm/app/master/selfhosted.go → cmd/kubeadm/app/phases/controlplane/selfhosted.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"k8s.io/api/core/v1"
-	ext "k8s.io/api/extensions/v1beta1"
+	extensions "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -31,6 +31,7 @@ import (
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/images"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/pkg/util/version"
 )
 
@@ -115,7 +116,7 @@ func launchSelfHostedAPIServer(cfg *kubeadmapi.MasterConfiguration, client *clie
 		return fmt.Errorf("unable to delete temporary API server manifest [%v]", err)
 	}
 
-	WaitForAPI(client)
+	kubeadmutil.WaitForAPI(client)
 
 	fmt.Printf("[self-hosted] self-hosted kube-apiserver ready after %f seconds\n", time.Since(start).Seconds())
 	return nil
@@ -193,8 +194,8 @@ func waitForPodsWithLabel(client *clientset.Clientset, appLabel string, mustBeRu
 }
 
 // Sources from bootkube templates.go
-func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount, kubeVersion *version.Version) ext.DaemonSet {
-	ds := ext.DaemonSet{
+func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount, kubeVersion *version.Version) extensions.DaemonSet {
+	ds := extensions.DaemonSet{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "extensions/v1beta1",
 			Kind:       "DaemonSet",
@@ -204,7 +205,7 @@ func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, vo
 			Namespace: "kube-system",
 			Labels:    map[string]string{"k8s-app": "self-hosted-" + kubeAPIServer},
 		},
-		Spec: ext.DaemonSetSpec{
+		Spec: extensions.DaemonSetSpec{
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
@@ -237,8 +238,8 @@ func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, vo
 	return ds
 }
 
-func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount, kubeVersion *version.Version) ext.Deployment {
-	d := ext.Deployment{
+func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount, kubeVersion *version.Version) extensions.Deployment {
+	d := extensions.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "extensions/v1beta1",
 			Kind:       "Deployment",
@@ -248,11 +249,11 @@ func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes
 			Namespace: "kube-system",
 			Labels:    map[string]string{"k8s-app": "self-hosted-" + kubeControllerManager},
 		},
-		Spec: ext.DeploymentSpec{
+		Spec: extensions.DeploymentSpec{
 			// TODO bootkube uses 2 replicas
-			Strategy: ext.DeploymentStrategy{
-				Type: ext.RollingUpdateDeploymentStrategyType,
-				RollingUpdate: &ext.RollingUpdateDeployment{
+			Strategy: extensions.DeploymentStrategy{
+				Type: extensions.RollingUpdateDeploymentStrategyType,
+				RollingUpdate: &extensions.RollingUpdateDeployment{
 					MaxUnavailable: &maxUnavailable,
 					MaxSurge:       &maxSurge,
 				},
@@ -289,8 +290,8 @@ func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes
 	return d
 }
 
-func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount) ext.Deployment {
-	d := ext.Deployment{
+func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, volumeMounts []v1.VolumeMount) extensions.Deployment {
+	d := extensions.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "extensions/v1beta1",
 			Kind:       "Deployment",
@@ -300,11 +301,11 @@ func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Vo
 			Namespace: "kube-system",
 			Labels:    map[string]string{"k8s-app": "self-hosted-" + kubeScheduler},
 		},
-		Spec: ext.DeploymentSpec{
+		Spec: extensions.DeploymentSpec{
 			// TODO bootkube uses 2 replicas
-			Strategy: ext.DeploymentStrategy{
-				Type: ext.RollingUpdateDeploymentStrategyType,
-				RollingUpdate: &ext.RollingUpdateDeployment{
+			Strategy: extensions.DeploymentStrategy{
+				Type: extensions.RollingUpdateDeploymentStrategyType,
+				RollingUpdate: &extensions.RollingUpdateDeployment{
 					MaxUnavailable: &maxUnavailable,
 					MaxSurge:       &maxSurge,
 				},

cmd/kubeadm/app/util/BUILD

@@ -11,14 +11,19 @@ load(
 go_library(
     name = "go_default_library",
     srcs = [
+        "apiclient.go",
         "error.go",
         "template.go",
         "version.go",
     ],
     tags = ["automanaged"],
     deps = [
+        "//cmd/kubeadm/app/constants:go_default_library",
         "//cmd/kubeadm/app/preflight:go_default_library",
+        "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
     ],
 )
 

cmd/kubeadm/app/master/apiclient.go → cmd/kubeadm/app/util/apiclient.go

 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package util
 
 import (
 	"fmt"