Merge pull request #3285 from SataQiu/clean-master-20200703

🌱 Remove use of 'master' word from our codebase

Author: k8s-ci-robot

bootstrap/kubeadm/main.go

@@ -84,7 +84,7 @@ func InitFlags(fs *pflag.FlagSet) {
 		"Interval at which non-leader candidates will wait to force acquire leadership (duration string)")
 
 	fs.DurationVar(&leaderElectionRenewDeadline, "leader-election-renew-deadline", 10*time.Second,
-		"Duration that the acting master will retry refreshing leadership before giving up (duration string)")
+		"Duration that the leading controller manager will retry refreshing leadership before giving up (duration string)")
 
 	fs.DurationVar(&leaderElectionRetryPeriod, "leader-election-retry-period", 2*time.Second,
 		"Duration the LeaderElector clients should wait between tries of actions (duration string)")

controllers/machinehealthcheck_targets.go

@@ -37,7 +37,7 @@ const (
 	// Event types
 
 	// EventSkippedControlPlane is emitted in case an unhealthy node (or a machine
-	// associated with the node) has the `master` role
+	// associated with the node) has the `control-plane` role
 	// Deprecated: no longer in use
 	EventSkippedControlPlane string = "SkippedControlPlane"
 	// EventMachineDeletionFailed is emitted in case remediation of a machine

controlplane/kubeadm/internal/workload_cluster.go

@@ -44,9 +44,9 @@ import (
 )
 
 const (
-	kubeProxyKey        = "kube-proxy"
-	kubeadmConfigKey    = "kubeadm-config"
-	labelNodeRoleMaster = "node-role.kubernetes.io/master"
+	kubeProxyKey              = "kube-proxy"
+	kubeadmConfigKey          = "kubeadm-config"
+	labelNodeRoleControlPlane = "node-role.kubernetes.io/master"
 )
 
 var (
@@ -89,7 +89,7 @@ type Workload struct {
 func (w *Workload) getControlPlaneNodes(ctx context.Context) (*corev1.NodeList, error) {
 	nodes := &corev1.NodeList{}
 	labels := map[string]string{
-		labelNodeRoleMaster: "",
+		labelNodeRoleControlPlane: "",
 	}
 
 	if err := w.Client.List(ctx, nodes, ctrlclient.MatchingLabels(labels)); err != nil {

controlplane/kubeadm/internal/workload_cluster_etcd_test.go

@@ -183,7 +183,7 @@ func TestRemoveEtcdMemberForMachine(t *testing.T) {
 			Name:      "cp1",
 			Namespace: "cp1",
 			Labels: map[string]string{
-				labelNodeRoleMaster: "",
+				labelNodeRoleControlPlane: "",
 			},
 		},
 	}

controlplane/kubeadm/internal/workload_cluster_test.go

@@ -483,7 +483,7 @@ func TestClusterStatus(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "node1",
 			Labels: map[string]string{
-				labelNodeRoleMaster: "",
+				labelNodeRoleControlPlane: "",
 			},
 		},
 		Status: corev1.NodeStatus{
@@ -497,7 +497,7 @@ func TestClusterStatus(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "node2",
 			Labels: map[string]string{
-				labelNodeRoleMaster: "",
+				labelNodeRoleControlPlane: "",
 			},
 		},
 		Status: corev1.NodeStatus{

controlplane/kubeadm/main.go

@@ -82,7 +82,7 @@ func InitFlags(fs *pflag.FlagSet) {
 		"Interval at which non-leader candidates will wait to force acquire leadership (duration string)")
 
 	fs.DurationVar(&leaderElectionRenewDeadline, "leader-election-renew-deadline", 10*time.Second,
-		"Duration that the acting master will retry refreshing leadership before giving up (duration string)")
+		"Duration that the leading controller manager will retry refreshing leadership before giving up (duration string)")
 
 	fs.DurationVar(&leaderElectionRetryPeriod, "leader-election-retry-period", 2*time.Second,
 		"Duration the LeaderElector clients should wait between tries of actions (duration string)")

docs/book/src/user/concepts.md

@@ -23,7 +23,7 @@ The Bootstrap Provider is responsible for:
 
 1. Generating the cluster certificates, if not otherwise specified
 1. Initializing the control plane, and gating the creation of other nodes until it is complete
-1. Joining master and worker nodes to the cluster
+1. Joining control plane and worker nodes to the cluster
 
 ### Control plane
 

docs/book/src/user/quick-start.md

@@ -486,7 +486,7 @@ export NODE_OS="ubuntu_18_04"
 export SSH_KEY="my-ssh"
 export POD_CIDR="172.25.0.0/16"
 export SERVICE_CIDR="172.26.0.0/16"
-export MASTER_NODE_TYPE="t1.small"
+export CONTROLPLANE_NODE_TYPE="t1.small"
 export WORKER_NODE_TYPE="t1.small"
 ```
 

main.go

@@ -90,7 +90,7 @@ func InitFlags(fs *pflag.FlagSet) {
 		"Interval at which non-leader candidates will wait to force acquire leadership (duration string)")
 
 	fs.DurationVar(&leaderElectionRenewDeadline, "leader-election-renew-deadline", 10*time.Second,
-		"Duration that the acting master will retry refreshing leadership before giving up (duration string)")
+		"Duration that the leading controller manager will retry refreshing leadership before giving up (duration string)")
 
 	fs.DurationVar(&leaderElectionRetryPeriod, "leader-election-retry-period", 2*time.Second,
 		"Duration the LeaderElector clients should wait between tries of actions (duration string)")

test/framework/cluster_proxy.go

@@ -183,7 +183,7 @@ func (p *clusterProxy) GetWorkloadCluster(ctx context.Context, namespace, name s
 	// gets the kubeconfig from the cluster
 	config := p.getKubeconfig(ctx, namespace, name)
 
-	// if we are on mac and the cluster is a DockerCluster, it is required to fix the master address
+	// if we are on mac and the cluster is a DockerCluster, it is required to fix the control plane address
 	// by using localhost:load-balancer-host-port instead of the address used in the docker network.
 	if goruntime.GOOS == "darwin" && p.isDockerCluster(ctx, namespace, name) {
 		p.fixConfig(ctx, name, config)
@@ -226,12 +226,12 @@ func (p *clusterProxy) fixConfig(ctx context.Context, name string, config *api.C
 	port, err := findLoadBalancerPort(ctx, name)
 	Expect(err).ToNot(HaveOccurred(), "Failed to get load balancer port")
 
-	masterURL := &url.URL{
+	controlPlaneURL := &url.URL{
 		Scheme: "https",
 		Host:   "127.0.0.1:" + port,
 	}
 	currentCluster := config.Contexts[config.CurrentContext].Cluster
-	config.Clusters[currentCluster].Server = masterURL.String()
+	config.Clusters[currentCluster].Server = controlPlaneURL.String()
 }
 
 func findLoadBalancerPort(ctx context.Context, name string) (string, error) {