diff --git a/data/workshop/exercise1.mdx b/data/workshop/exercise1.mdx index 8c9d2b4..606bf7b 100644 --- a/data/workshop/exercise1.mdx +++ b/data/workshop/exercise1.mdx @@ -28,7 +28,7 @@ To get underway open your web browser and navigate to the following link to rese -## 1.2 - Logging into your cluster +## 1.2 - Logging into your cluster console After entering an email and the provided password you'll be presented with a console url and login credentials for your OpenShift cluster. @@ -40,4 +40,16 @@ Open the console url and login. | *Obtaining a workshop environment* | -You're now ready to proceed with the next exercise 🎉. + +## 1.3 - Logging into your bastion host + +Along with the cluster web console we will also use the command line during this workshop. You've been allocated a bastion host that you can ssh to as part of step 1.1. + +Follow the steps below to connect to your environment bastion host: + +1. Open your preferrred terminal application. +2. Enter `ssh lab-user@` replacing `` with the hostname listed in your **Bastion Access** environment details page. +3. Enter `yes` if you receive a host key verification prompt. This only appears as it is the first time you have connected to this host. +4. When prompted enter the password mentioned under **Bastion Access** in your environment details page. + +Congratulations, you're now ready to proceed with the next exercise 🎉. diff --git a/data/workshop/exercise2.mdx b/data/workshop/exercise2.mdx index 8a9b221..0199960 100644 --- a/data/workshop/exercise2.mdx +++ b/data/workshop/exercise2.mdx @@ -21,13 +21,14 @@ To install Operators on OpenShift we use Operator Hub. A simplistic way of think | *OpenShift Operator Hub* | + ## 2.1 - Enable hybrid networking -As a cluster administrator, you can configure a Red Hat OpenShift cluster network to allow Linux and Windows nodes to host Linux and Windows workloads, respectively. +Before installing the windows maching config operator our first step as a cluster administrator is configure a our OpenShift cluster network to allow Linux and Windows nodes to host Linux and Windows workloads, respectively. -This requires enabling a feature called **[hybrid networking](https://docs.openshift.com/container-platform/4.15/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.html#configuring-hybrid-ovnkubernetes)**. +This requires enabling a feature called **[hybrid overlay networking](https://docs.openshift.com/container-platform/4.15/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.html#configuring-hybrid-ovnkubernetes)**. -To configure hybrid networking, run the following command in your bastion host terminal: +To configure hybrid overlay networking, run the following command in your bastion host terminal: ```bash oc patch networks.operator.openshift.io cluster --type=merge \ @@ -49,10 +50,16 @@ oc patch networks.operator.openshift.io cluster --type=merge \ }' ``` + +|![workshop](/workshops/static/images/windows/hybrid-networking.gif) | +|:-----------------------------------------------------------------------------:| +| *Patching an OpenShift cluster network to enable hybrid networking* | + + ## 2.2 - Install the windows machine config operator -If you have a running OpenShift cluster, you can install the optional **Windows Machine Config Operator** to configure Windows machines into nodes, enabling Windows container workloads to be ran within your OpenShift cluster. +If you have a running OpenShift cluster and have enabled hybrid overlay networking, you can then install the optional **Windows Machine Config Operator**. This operator will configure any Windows machines we add to the cluster, enabling Windows container workloads to be run within your OpenShift cluster. Windows instances can be added either by creating a `MachineSet`, or by specifying existing instances through a `ConfigMap`. The operator will do all the necessary steps to configure the instance so that it can join the cluster as a worker node. @@ -75,15 +82,15 @@ Follow the steps below to install the operator: The windows machine config operator expects a secret to be present in its namespace called `cloud-private-key` containing a private key. This private key will be used to log into the soon to be provisioned Windows machine and set it up as an OpenShift node. -Run the commands below to connect to your environment bastion host and create the required secret. +Run the commands below from your bastion host to create the required secret. -1. Enter `ssh lab-user@` replacing `` with the one listed in your **Bastion Access** environment details page. -2. Enter the password mentioned under **Bastion Access** in your environment details page. -3. Generate a new ssh key with `ssh-keygen -t rsa -f ${HOME}/.ssh/winkey -q -N ''` -4. Run the command below to create the required secret from the public key you just created. +1. Generate a new ssh key with `ssh-keygen -t rsa -f ${HOME}/.ssh/winkey -q -N ''` +2. Run the command below to create the required secret from the public key you just created. ```bash -oc create secret generic cloud-private-key --from-file=private-key.pem=${HOME}/.ssh/winkey -n openshift-windows-machine-config-operator +oc create secret generic cloud-private-key \ + --from-file=private-key.pem=${HOME}/.ssh/winkey \ + --namespace openshift-windows-machine-config-operator ``` diff --git a/data/workshop/exercise3.mdx b/data/workshop/exercise3.mdx index 71507b9..af9963c 100644 --- a/data/workshop/exercise3.mdx +++ b/data/workshop/exercise3.mdx @@ -112,3 +112,11 @@ After retrieving your cluster id and zone update the sample `MachineSet` using y Within OpenShift you can then click the ➕ button in the top right hand corner, paste in your yaml and click **Create**. + +``` + + +|![workshop](/workshops/static/images/windows/create-machineset.gif) | +|:-----------------------------------------------------------------------------:| +| *Create a windows machineset* | + diff --git a/public/static/images/windows/create-machineset.gif b/public/static/images/windows/create-machineset.gif new file mode 100644 index 0000000..7af29ca Binary files /dev/null and b/public/static/images/windows/create-machineset.gif differ diff --git a/public/static/images/windows/hybrid-networking.gif b/public/static/images/windows/hybrid-networking.gif new file mode 100644 index 0000000..52b9c91 Binary files /dev/null and b/public/static/images/windows/hybrid-networking.gif differ