Skip to content

Updated references for OpenShift 'master' to 'control plane node' #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/bmquickstart-static.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ git clone https://github.com/redhat-cop/ocp4-helpernode
cd ocp4-helpernode
```

Create the [vars-static.yaml](examples/vars-static.yaml) file with the IP addresss that will be assigned to the masters/workers/boostrap. The IP addresses need to be right since they will be used to create your DNS server.
Create the [vars-static.yaml](examples/vars-static.yaml) file with the IP addresss that will be assigned to the control plane nodes/workers/boostrap. The IP addresses need to be right since they will be used to create your DNS server.

```
cp docs/examples/vars-static.yaml .
Expand Down Expand Up @@ -115,7 +115,7 @@ compute:
replicas: 0
controlPlane:
hyperthreading: Enabled
name: master
name: controlplane
replicas: 3
metadata:
name: ocp4
Expand All @@ -139,12 +139,12 @@ Create the installation manifests
openshift-install create manifests
```

Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.

> :rotating_light: Skip this step if you're installing a compact cluster

```shell
$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
```

It should look something like this after you edit it.
Expand All @@ -157,7 +157,7 @@ metadata:
creationTimestamp: null
name: cluster
spec:
mastersSchedulable: false
controlplaneSchedulable: false
policy:
name: ""
status: {}
Expand Down Expand Up @@ -215,7 +215,7 @@ On your laptop/workstation visit the status page
firefox http://192.168.7.77:9000
```

You'll see the bootstrap turn "green" and then the masters turn "green", then the bootstrap turn "red". This is your indication that you can continue.
You'll see the bootstrap turn "green" and then the control plane nodes turn "green", then the bootstrap turn "red". This is your indication that you can continue.

### ISO Maker

Expand Down
12 changes: 6 additions & 6 deletions docs/bmquickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ git clone https://github.com/redhat-cop/ocp4-helpernode
cd ocp4-helpernode
```

Get the mac address of the instances/vms/servers that are going to be your OpenShift 4 cluster. At a minimum you need 1 bootstrap, 3 masters, and 2 workers. So you'll need to have 6 Mac Addresses
Get the mac address of the instances/vms/servers that are going to be your OpenShift 4 cluster. At a minimum you need 1 bootstrap, 3 control plane nodes, and 2 workers. So you'll need to have 6 Mac Addresses

Edit the [vars.yaml](examples/vars.yaml) file with the mac addresses of your instances.

Expand Down Expand Up @@ -117,7 +117,7 @@ compute:
replicas: 0
controlPlane:
hyperthreading: Enabled
name: master
name: controlplane
replicas: 3
metadata:
name: ocp4
Expand All @@ -141,12 +141,12 @@ Create the installation manifests
openshift-install create manifests
```

Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `mastersSchedulable` to `false`.
Edit the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines by setting `controlplaneSchedulable` to `false`.
Copy link

@whowutwut whowutwut Feb 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a spec change that has happened in the latest OpenShift? I think the spec name is mastersSchedulable

spec:
  mastersSchedulable: false
...

same comment applies to the other lines changed in this file.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@whowutwut oversight on my part. Reverted back to mastersSchedulable.


> :rotating_light: Skip this step if you're installing a compact cluster

```shell
$ sed -i 's/mastersSchedulable: true/mastersSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
$ sed -i 's/controlplaneSchedulable: true/controlplaneSchedulable: false/g' manifests/cluster-scheduler-02-config.yml
```

It should look something like this after you edit it.
Expand All @@ -159,7 +159,7 @@ metadata:
creationTimestamp: null
name: cluster
spec:
mastersSchedulable: false
controlplaneSchedulable: false
policy:
name: ""
status: {}
Expand Down Expand Up @@ -196,7 +196,7 @@ firefox http://192.168.7.77:9000
```
> :warning: Make sure you don't expose this port in public cloud environments!

You'll see the bootstrap turn "green" and then the masters turn "green", then the bootstrap turn "red". This is your indication that you can continue.
You'll see the bootstrap turn "green" and then the control plane nodes turn "green", then the bootstrap turn "red". This is your indication that you can continue.

## Wait for install

Expand Down
2 changes: 1 addition & 1 deletion docs/examples/install-config-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ compute:
replicas: 0
controlPlane:
hyperthreading: Enabled
name: master
name: controlplane
replicas: 3
metadata:
name: ocp4
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/install-config-local-registry-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ compute:
replicas: 0
controlPlane:
hyperthreading: Enabled
name: master
name: controlplane
replicas: 3
metadata:
name: ocp4
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-chrony.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-compact-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ dns:
bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
other:
- name: "non-cluster-vm"
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-compact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
other:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-ha-ppc64le.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-local-registry-ppc64le.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-local-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-nfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ dns:
bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
workers:
- name: "worker0"
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-nightlies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-ppc64le.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-static-nightlies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ dns:
bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
workers:
- name: "worker0"
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ dns:
bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
workers:
- name: "worker0"
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ bootstrap:
name: "bootstrap"
ipaddr: "192.168.7.20"
macaddr: "52:54:00:60:72:67"
masters:
- name: "master0"
controlplane_nodes:
- name: "controlplane0"
ipaddr: "192.168.7.21"
macaddr: "52:54:00:e7:9d:67"
- name: "master1"
- name: "controlplane1"
ipaddr: "192.168.7.22"
macaddr: "52:54:00:80:16:23"
- name: "master2"
- name: "controlplane2"
ipaddr: "192.168.7.23"
macaddr: "52:54:00:d5:1c:39"
workers:
Expand Down
Loading