Merge pull request #74590 from vanduc95/cleanup-kubeadm-cont.6-20190226

cmd/kubeadm/app/cmd/upgrade/diff_test.go

@@ -22,7 +22,7 @@ import (
 )
 
 const (
-	testUpgradeDiffConfig   = `testdata/diff_master_config.yaml`
+	testUpgradeDiffConfig   = `testdata/diff_controlplane_config.yaml`
 	testUpgradeDiffManifest = `testdata/diff_dummy_manifest.yaml`
 )
 

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal.yaml

@@ -198,7 +198,7 @@ Networking:
 NodeRegistration:
   CRISocket: /var/run/dockershim.sock
   KubeletExtraArgs: null
-  Name: master-1
+  Name: control-plane-1
   Taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal_non_linux.yaml

@@ -197,7 +197,7 @@ Networking:
 NodeRegistration:
   CRISocket: /var/run/dockershim.sock
   KubeletExtraArgs: null
-  Name: master-1
+  Name: control-plane-1
   Taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3.yaml

@@ -13,7 +13,7 @@ bootstrapTokens:
 kind: InitConfiguration
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3_non_linux.yaml

@@ -13,7 +13,7 @@ bootstrapTokens:
 kind: InitConfiguration
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1.yaml

@@ -13,7 +13,7 @@ localAPIEndpoint:
   bindPort: 6443
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1_non_linux.yaml

@@ -13,7 +13,7 @@ localAPIEndpoint:
   bindPort: 6443
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/node/internal.yaml

@@ -15,7 +15,7 @@ Discovery:
 NodeRegistration:
   CRISocket: /var/run/dockershim.sock
   KubeletExtraArgs: null
-  Name: master-1
+  Name: control-plane-1
   Taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/node/v1alpha3.yaml

@@ -13,7 +13,7 @@ discoveryTokenUnsafeSkipCAVerification: true
 kind: JoinConfiguration
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/conversion/node/v1beta1.yaml

@@ -14,7 +14,7 @@ discovery:
 kind: JoinConfiguration
 nodeRegistration:
   criSocket: /var/run/dockershim.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml

@@ -13,7 +13,7 @@ localAPIEndpoint:
   bindPort: 6443
 nodeRegistration:
   criSocket: /var/run/criruntime.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml

@@ -13,7 +13,7 @@ localAPIEndpoint:
   bindPort: 6443
 nodeRegistration:
   criSocket: /var/run/criruntime.sock
-  name: master-1
+  name: control-plane-1
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/incomplete.yaml

@@ -6,7 +6,7 @@ localAPIEndpoint:
   advertiseAddress: 192.168.2.2
 nodeRegistration:
   criSocket: /var/run/criruntime.sock
-  name: master-1
+  name: control-plane-1
 ---
 apiVersion: kubeadm.k8s.io/v1beta1
 certificatesDir: /var/lib/kubernetes/pki