diff --git a/cmd/kubeadm/app/cmd/upgrade/diff_test.go b/cmd/kubeadm/app/cmd/upgrade/diff_test.go index a4de23b1048..9c10928f336 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 1753225c3a7..17891246e2f 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 438ba49899b..b0393468ef4 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 27731830fea..1317a1c3067 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 344e96e2dbc..eb91bf825d7 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 91d521cb89d..9dd7570e4fc 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 6fcc9049a18..2b1d5293a93 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 66219eaabc4..c83e611a107 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 a2aef712140..607e047a45f 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 05ce7a0083e..90bd7430140 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 459029bf30d..813b161c93f 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 2edebfb2d7a..c3124af1f75 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 a6ce8a50178..f945cec6101 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