Skip to content

Commit 8d07d97

Browse files
author
Sakthi Vetrivel
committed
fixing tutorials per Jason's comments
1 parent ff65c50 commit 8d07d97

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

articles/openshift/tutorial-connect-cluster.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ ms.date: 04/24/2020
1111

1212
# Tutorial: Connect to an Azure Red Hat OpenShift 4 cluster
1313

14-
In this tutorial, part two of three, you will connect to an Azure Red Hat OpenShift (ARO) cluster running OpenShift 4 as the kube-admin user through the OpenShift web console. You learn how to:
14+
In this tutorial, part two of three, you will connect to an Azure Red Hat OpenShift (ARO) cluster running OpenShift 4 as the kubeadmin user through the OpenShift web console. You learn how to:
1515
> [!div class="checklist"]
16-
> * Obtain `kube-admin` credentials for your cluster
16+
> * Obtain `kubeadmin` credentials for your cluster
1717
> * Install the OpenShift CLI
1818
> * Connect to an ARO cluster using the OpenShift CLI
1919
@@ -92,7 +92,7 @@ oc login $apiServer -u kubeadmin -p <kubeadmin password>
9292

9393
In this part of the tutorial, you learned how to:
9494
> [!div class="checklist"]
95-
> * Obtain `kube-admin` credentials for your cluster
95+
> * Obtain `kubeadmin` credentials for your cluster
9696
> * Install the OpenShift CLI
9797
> * Connect to an ARO cluster using the OpenShift CLI
9898

articles/openshift/tutorial-create-cluster.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ az -v
5454
```output
5555
...
5656
Extensions:
57-
aro 0.1.0
57+
aro 1.0.0
5858
...
5959
```
6060

@@ -84,10 +84,8 @@ Next, you will create a virtual network containing two empty subnets.
8484

8585
An Azure resource group is a logical group in which Azure resources are deployed and managed. When you create a resource group, you are asked to specify a location. This location is where resource group metadata is stored, it is also where your resources run in Azure if you don't specify another region during resource creation. Create a resource group using the [az group create][az-group-create] command.
8686

87-
The following example creates a resource group named *aro-rg* in the *eastus* location.
88-
8987
```azurecli-interactive
90-
az group create --name aro-rg --location eastus
88+
az group create --name $CLUSTER --location $LOCATION
9189
```
9290
9391
The following example output shows the resource group created successfully:
@@ -105,17 +103,17 @@ Next, you will create a virtual network containing two empty subnets.
105103
}
106104
```
107105
108-
3. **Create a virtual network.**
106+
2. **Create a virtual network.**
109107
110108
Azure Red Hat OpenShift clusters running OpenShift 4 require a virtual network with two empty subnets, for the master and worker nodes.
111109
112-
Create a new virtual network in the same resource group you created earlier, for example in *aro-rg*.
110+
Create a new virtual network in the same resource group you created earlier.
113111
114112
```azurecli-interactive
115113
az network vnet create \
116-
--resource-group aro-rg \
114+
--resource-group $RESOURCEGROUP \
117115
--name aro-vnet \
118-
--address-prefixes 10.0.0.0/8
116+
--address-prefixes 10.0.0.0/22
119117
```
120118
121119
The following example output shows the virtual network created successfully:
@@ -138,34 +136,34 @@ Next, you will create a virtual network containing two empty subnets.
138136
}
139137
```
140138
141-
4. **Add an empty subnet for the master nodes.**
139+
3. **Add an empty subnet for the master nodes.**
142140
143141
```azurecli-interactive
144142
az network vnet subnet create \
145-
--resource-group aro-rg \
143+
--resource-group $RESOURCEGROUP \
146144
--vnet-name aro-vnet \
147145
--name master-subnet \
148146
--address-prefixes 10.0.1.0/24 \
149147
--service-endpoints Microsoft.ContainerRegistry
150148
```
151149
152-
5. **Add an empty subnet for the worker nodes.**
150+
4. **Add an empty subnet for the worker nodes.**
153151
154152
```azurecli-interactive
155153
az network vnet subnet create \
156-
--resource-group aro-rg \
154+
--resource-group $RESOURCEGROUP \
157155
--vnet-name aro-vnet \
158156
--name worker-subnet \
159157
--address-prefixes 10.1.0.0/20 \
160158
--service-endpoints Microsoft.ContainerRegistry
161159
```
162160
163-
6. **[Disable subnet private endpoint policies](https://docs.microsoft.com/azure/private-link/disable-private-link-service-network-policy) on the master subnet.** This is required to be able to connect and manage the cluster.
161+
5. **[Disable subnet private endpoint policies](https://docs.microsoft.com/azure/private-link/disable-private-link-service-network-policy) on the master subnet.** This is required to be able to connect and manage the cluster.
164162
165163
```azurecli-interactive
166164
az network vnet subnet update \
167165
--name master-subnet \
168-
--resource-group aro-rg \
166+
--resource-group $RESOURCEGROUP \
169167
--vnet-name aro-vnet \
170168
--disable-private-link-service-network-policies true
171169
```
@@ -176,13 +174,13 @@ Run the following command to create a cluster. Optionally, you can pass a pull s
176174
177175
```azurecli-interactive
178176
az aro create \
179-
--resource-group aro-rg \
180-
--name aro-cluster \
177+
--resource-group $RESOURCEGROUP \
178+
--name $CLUSTER \
181179
--vnet aro-vnet \
182180
--master-subnet master-subnet \
183181
--worker-subnet worker-subnet
184182
# --domain foo.example.com # [OPTIONAL] custom domain
185-
# --pull-secret 'Pull secret from https://cloud.redhat.com/openshift/install/azure/installer-provisioned/' # [OPTIONAL]
183+
# --pull-secret '$(< pull-secret.txt)' # [OPTIONAL]
186184
```
187185
>[!NOTE]
188186
> It normally takes about 35 minutes to create a cluster.

articles/openshift/tutorial-delete-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ In this part of the tutorial, you learned how to:
5555
> [!div class="checklist"]
5656
> * Delete an Azure Red Hat OpenShift 4 cluster
5757
58-
Learn more about using OpenShift with the official [Red Hat OpenShift documentation](https://docs.openshift.com/aro/welcome/index.html)
58+
Learn more about using OpenShift with the official [Red Hat OpenShift documentation](https://www.openshift.com/try)

0 commit comments

Comments
 (0)