From 3759fcd4c8bf4920d2536bcf1db4687e0ef5a6c3 Mon Sep 17 00:00:00 2001 From: vanduc95 Date: Mon, 25 Feb 2019 13:23:13 +0700 Subject: [PATCH] kubeadm cleanup: master -> control-plane (cont.6) --- cmd/kubeadm/app/cmd/upgrade/diff_test.go | 2 +- .../{diff_master_config.yaml => diff_controlplane_config.yaml} | 0 .../util/config/testdata/conversion/controlplane/internal.yaml | 2 +- .../testdata/conversion/controlplane/internal_non_linux.yaml | 2 +- .../util/config/testdata/conversion/controlplane/v1alpha3.yaml | 2 +- .../testdata/conversion/controlplane/v1alpha3_non_linux.yaml | 2 +- .../util/config/testdata/conversion/controlplane/v1beta1.yaml | 2 +- .../testdata/conversion/controlplane/v1beta1_non_linux.yaml | 2 +- .../app/util/config/testdata/conversion/node/internal.yaml | 2 +- .../app/util/config/testdata/conversion/node/v1alpha3.yaml | 2 +- .../app/util/config/testdata/conversion/node/v1beta1.yaml | 2 +- .../util/config/testdata/defaulting/controlplane/defaulted.yaml | 2 +- .../testdata/defaulting/controlplane/defaulted_non_linux.yaml | 2 +- .../config/testdata/defaulting/controlplane/incomplete.yaml | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename cmd/kubeadm/app/cmd/upgrade/testdata/{diff_master_config.yaml => diff_controlplane_config.yaml} (100%) diff --git a/cmd/kubeadm/app/cmd/upgrade/diff_test.go b/cmd/kubeadm/app/cmd/upgrade/diff_test.go index a4de23b104..9c10928f33 100644 --- a/cmd/kubeadm/app/cmd/upgrade/diff_test.go +++ b/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` ) diff --git a/cmd/kubeadm/app/cmd/upgrade/testdata/diff_master_config.yaml b/cmd/kubeadm/app/cmd/upgrade/testdata/diff_controlplane_config.yaml similarity index 100% rename from cmd/kubeadm/app/cmd/upgrade/testdata/diff_master_config.yaml rename to cmd/kubeadm/app/cmd/upgrade/testdata/diff_controlplane_config.yaml diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal.yaml index 1753225c3a..17891246e2 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal_non_linux.yaml index 438ba49899..b0393468ef 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal_non_linux.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3.yaml index 27731830fe..1317a1c306 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3_non_linux.yaml index 344e96e2db..eb91bf825d 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3_non_linux.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1.yaml index 91d521cb89..9dd7570e4f 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1_non_linux.yaml index 6fcc9049a1..2b1d5293a9 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1_non_linux.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/node/internal.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/node/internal.yaml index 66219eaabc..c83e611a10 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/node/internal.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/node/v1alpha3.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/node/v1alpha3.yaml index a2aef71214..607e047a45 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/node/v1alpha3.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/node/v1beta1.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/node/v1beta1.yaml index 05ce7a0083..90bd743014 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/node/v1beta1.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml index 459029bf30..813b161c93 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml index 2edebfb2d7..c3124af1f7 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml +++ b/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 diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/incomplete.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/incomplete.yaml index a6ce8a5017..f945cec610 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/incomplete.yaml +++ b/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