Remove non inclusive terms (kubevirt#709)

* Remove non inclusive terms
Replace the term master with control-plane when it refers to nodes.
Replace the term master with main where possible if it refers to a branch.

Signed-off-by: fossedihelm <[email protected]>

* Use correct node selector when using k8s version < 1.20

Signed-off-by: fossedihelm <[email protected]>

Author: fossedihelm

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Welcome! As stated in the [README](README.md) this repository contains code for the virtualized clusters used in testing KubeVirt.
 
-See [the KubeVirt contribution guide](https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md) for general information about how to contribute.
+See [the KubeVirt contribution guide](https://github.com/kubevirt/kubevirt/blob/main/CONTRIBUTING.md) for general information about how to contribute.
 
 ## Getting started with gocli
 

KUBEVIRTCI_LOCAL_TESTING.md

@@ -57,7 +57,7 @@ export KUBEVIRT_DEPLOY_GRAFANA=true
 
 After making changes to a kubevirtci provider, it's recommended to test it locally including kubevirt e2e tests before publishing it.
 
-With the changes in place you can execute locally [`make functest`](https://github.com/kubevirt/kubevirt/blob/master/docs/getting-started.md#testing) against a cluster with kubevirt that was provisioned using `kubevirtci`.
+With the changes in place you can execute locally [`make functest`](https://github.com/kubevirt/kubevirt/blob/main/docs/getting-started.md#testing) against a cluster with kubevirt that was provisioned using `kubevirtci`.
 
 `$KUBEVIRT_DIR` is assumed to be your kubevirt path.
 

cluster-provision/README.md

@@ -15,7 +15,7 @@ gocli help
 
 ### Start the cluster
 
-Start a k8s cluster which contains of one master and two nodes:
+Start a k8s cluster which contains of one control-plane and two nodes:
 
 ```bash
 gocli run --random-ports --nodes 3 --background kubevirtci/k8s-1.13.3

cluster-provision/gocli/cmd/scp.go

@@ -51,7 +51,7 @@ func NewSCPCommand() *cobra.Command {
 
 	ssh := &cobra.Command{
 		Use:   "scp SRC DST",
-		Short: "scp copies files from master node to the local host",
+		Short: "scp copies files from control-plane node to the local host",
 		RunE:  scp,
 		Args:  cobra.MinimumNArgs(2),
 	}

cluster-provision/gocli/cmd/utils/ports.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	// PortSSH contains SSH port for the master node
+	// PortSSH contains SSH port for the control-plane node
 	PortSSH = 2201
 	// PortSSHWorker contains SSH port for the worker node
 	PortSSHWorker = 2202
@@ -33,7 +33,7 @@ const (
 	//PortUploadProxy contains CDI UploadProxy port
 	PortUploadProxy = 31001
 
-	// PortNameSSH contains master node SSH port name
+	// PortNameSSH contains control-plane node SSH port name
 	PortNameSSH = "ssh"
 	// PortNameSSHWorker contains worker node SSH port name
 	PortNameSSHWorker = "ssh-worker"

cluster-provision/tools/check-image-pull-policies/testdata/cni.yaml

@@ -474,7 +474,7 @@ subjects:
 # Source: calico/templates/calico-node.yaml
 # This manifest installs the calico-node container, as well
 # as the CNI plugins and network config on
-# each master and worker node in a Kubernetes cluster.
+# each control-plane and worker node in a Kubernetes cluster.
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -761,7 +761,7 @@ spec:
         # Mark the pod as a critical add-on for rescheduling.
         - key: CriticalAddonsOnly
           operator: Exists
-        - key: node-role.kubernetes.io/master
+        - key: node-role.kubernetes.io/control-plane
           effect: NoSchedule
       serviceAccountName: calico-kube-controllers
       priorityClassName: system-cluster-critical

cluster-up/cluster/K8S.md

@@ -19,17 +19,17 @@ export KUBEVIRT_PROVIDER=k8s-1.21   # choose kubevirtci provider version by subd
 ## Bringing the cluster up
 
 ```bash
-export KUBEVIRT_NUM_NODES=2         # master + one node
+export KUBEVIRT_NUM_NODES=2         # control-plane + one node
 make cluster-up
 ```
 
 The cluster can be accessed as usual:
 
 ```bash
 $ cluster/kubectl.sh get nodes
-NAME      STATUS     ROLES     AGE       VERSION
-node01    NotReady   master    31s       v1.21.1
-node02    NotReady   <none>    5s        v1.21.1
+NAME      STATUS     ROLES          AGE       VERSION
+node01    NotReady   control-plane  31s       v1.21.1
+node02    NotReady   <none>         5s        v1.21.1
 ```
 
 Note: for further configuration environment variables please see [cluster-up/hack/common.sh](../hack/common.sh)

cluster-up/cluster/K8S_DEV_GUIDE.md

@@ -49,8 +49,8 @@ CONTAINER ID        IMAGE                   COMMAND                  CREATED
 Nodes:
 ```
 [root@modi01 kubevirtci]# oc get nodes
-NAME     STATUS   ROLES    AGE   VERSION
-node01   Ready    master   83m   v1.21.0
+NAME     STATUS   ROLES             AGE   VERSION
+node01   Ready    control-plane     83m   v1.21.0
 ```
 
 # Inner look of a deployed cluster

cluster-up/cluster/k8s-provider-common.sh

@@ -104,12 +104,12 @@ function up() {
 
     kubectl="${_cli} --prefix $provider_prefix ssh node01 -- sudo kubectl --kubeconfig=/etc/kubernetes/admin.conf"
 
-    # For multinode cluster Label all the non master nodes as workers,
-    # for one node cluster label master with 'master,worker' roles
+    # For multinode cluster Label all the non control-plane nodes as workers,
+    # for one node cluster label control-plane with 'control-plane,worker' roles
     if [ "$KUBEVIRT_NUM_NODES" -gt 1 ]; then
-        label="!node-role.kubernetes.io/master"
+        label="!node-role.kubernetes.io/control-plane"
     else
-        label="node-role.kubernetes.io/master"
+        label="node-role.kubernetes.io/control-plane"
     fi
     $kubectl label node -l $label node-role.kubernetes.io/worker=''
 

cluster-up/cluster/kind-1.22-sriov/sriov-components/manifests/sriov-cni-daemonset.yaml

@@ -22,7 +22,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/control-plane
         operator: Exists
         effect: NoSchedule
       containers:

cluster-up/cluster/kind-1.22-sriov/sriov-components/manifests/sriovdp-daemonset.yaml

@@ -29,7 +29,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/control-plane
         operator: Exists
         effect: NoSchedule
       serviceAccountName: sriov-device-plugin
@@ -94,7 +94,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: ppc64le
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/control-plane
         operator: Exists
         effect: NoSchedule
       serviceAccountName: sriov-device-plugin
@@ -158,7 +158,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: arm64
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node-role.kubernetes.io/control-plane
         operator: Exists
         effect: NoSchedule
       serviceAccountName: sriov-device-plugin

cluster-up/cluster/kind-k8s-1.19/provider.sh

@@ -33,7 +33,7 @@ function up() {
     nodes=$(_kubectl get nodes -o=custom-columns=:.metadata.name | awk NF)
     for node in $nodes; do
         # Create local-volume directories, which, on other providers, are pre-provisioned.
-        # For more info, check https://github.com/kubevirt/kubevirtci/blob/master/cluster-provision/STORAGE.md
+        # For more info, check https://github.com/kubevirt/kubevirtci/blob/main/cluster-provision/STORAGE.md
         for i in {1..10}; do
             mount_disk $node $i
         done

cluster-up/cluster/kind/common.sh

@@ -39,7 +39,12 @@ ETCD_IN_MEMORY_DATA_DIR="/tmp/kind-cluster-etcd"
 
 function _wait_kind_up {
     echo "Waiting for kind to be ready ..."
-    while [ -z "$(docker exec --privileged ${CLUSTER_NAME}-control-plane kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes --selector=node-role.kubernetes.io/master -o=jsonpath='{.items..status.conditions[-1:].status}' | grep True)" ]; do
+    if [[ $KUBEVIRT_PROVIDER =~ kind-.*1\.1.* ]]; then
+        selector="master"
+    else
+        selector="control-plane"
+    fi
+    while [ -z "$(docker exec --privileged ${CLUSTER_NAME}-control-plane kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes --selector=node-role.kubernetes.io/${selector} -o=jsonpath='{.items..status.conditions[-1:].status}' | grep True)" ]; do
         echo "Waiting for kind to be ready ..."
         sleep 10
     done
@@ -150,7 +155,7 @@ function _get_pods() {
 function _fix_node_labels() {
     # Due to inconsistent labels and taints state in multi-nodes clusters,
     # it is nessecery to remove taint NoSchedule and set role labels manualy:
-    #   Master nodes might lack 'scheduable=true' label and have NoScheduable taint.
+    #   Control-plane nodes might lack 'scheduable=true' label and have NoScheduable taint.
     #   Worker nodes might lack worker role label.
     master_nodes=$(_get_nodes | grep -i $MASTER_NODES_PATTERN | awk '{print $1}')
     for node in ${master_nodes[@]}; do

cluster-up/cluster/local/README.md

@@ -1,4 +1,4 @@
-# Local Kubernets Provider
+# Local Kubernetes Provider
 
 This provider allows developing against bleeding-edge Kubernetes code. The
 k8s sources will be compiled and a single-node cluster will be started.