Skip to content

Commit 00367d1

Browse files
committed
Combined deployments
1 parent ff143b2 commit 00367d1

File tree

3 files changed

+93
-56
lines changed

3 files changed

+93
-56
lines changed

articles/openshift/tutorial-connect-cluster.md

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
---
2-
title: Tutorial - Connect to an Azure Red Hat OpenShift 4 cluster
2+
title: Connect to an Azure Red Hat OpenShift 4 cluster
33
description: Learn how to connect a Microsoft Azure Red Hat OpenShift cluster
44
author: johnmarco
55
ms.author: johnmarc
6-
ms.topic: tutorial
6+
ms.topic: article
77
ms.service: azure-redhat-openshift
8-
ms.date: 04/24/2020
8+
ms.date: 06/12/2024
99
#Customer intent: As a developer, I want learn how to create an Azure Red Hat OpenShift cluster, scale it, and then clean up resources so that I am not charged for what I'm not using.
1010
---
1111

12-
# Tutorial: Connect to an Azure Red Hat OpenShift 4 cluster
12+
# 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 cluster running OpenShift 4 as the kubeadmin user through the OpenShift web console. You learn how to:
14+
In article, you'll learn how to connect to an Azure Red Hat OpenShift cluster running OpenShift 4 as the kubeadmin user through the OpenShift web console. You learn how to:
1515
> [!div class="checklist"]
1616
> * Obtain `kubeadmin` credentials for your cluster
1717
> * Install the OpenShift CLI
1818
> * Connect to an Azure Red Hat OpenShift cluster using the OpenShift CLI
1919
2020
## Before you begin
2121

22-
In previous tutorials, an Azure Red Hat OpenShift cluster was created. If you have not done these steps, and would like to follow along, start with [Tutorial 1 - Create an Azure Red Hat OpenShift 4 Cluster.](tutorial-create-cluster.md)
23-
24-
If you choose to install and use the CLI locally, this tutorial requires that you are running the Azure CLI version 2.6.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
22+
The steps in this article requires Azure CLI version 2.6.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
2523

2624
## Connect to the cluster
2725

@@ -90,12 +88,4 @@ oc login $apiServer -u kubeadmin -p <kubeadmin password>
9088

9189
## Next steps
9290

93-
In this part of the tutorial, you learned how to:
94-
> [!div class="checklist"]
95-
> * Obtain `kubeadmin` credentials for your cluster
96-
> * Install the OpenShift CLI
97-
> * Connect to an Azure Red Hat OpenShift cluster using the OpenShift CLI
98-
99-
Advance to the next tutorial:
100-
> [!div class="nextstepaction"]
101-
> [Delete an Azure Red Hat OpenShift cluster](tutorial-delete-cluster.md)
91+
Learn how to [delete an Azure Red Hat OpenShift cluster](tutorial-delete-cluster.md).

articles/openshift/tutorial-create-cluster.md

Lines changed: 77 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
---
2-
title: Tutorial - Create an Azure Red Hat OpenShift 4 cluster
2+
title: Create an Azure Red Hat OpenShift 4 cluster
33
description: Learn how to create a Microsoft Azure Red Hat OpenShift cluster using the Azure CLI
4-
author: joharder
5-
ms.author: joharder
6-
ms.topic: tutorial
4+
author: johnmarco
5+
ms.author: johnmarc
6+
ms.topic: article
77
ms.service: azure-redhat-openshift
88
ms.custom: devx-track-azurecli
9-
ms.date: 02/23/2022
9+
ms.date: 06/12/2024
1010
#Customer intent: As a developer, I want learn how to create an Azure Red Hat OpenShift cluster, scale it, and then clean up resources so that I am not charged for what I'm not using.
1111
---
1212

13-
# Tutorial: Create an Azure Red Hat OpenShift 4 cluster
13+
# Create an Azure Red Hat OpenShift 4 cluster
1414

15-
In this tutorial, part one of three, you prepare your environment to create an Azure Red Hat OpenShift cluster running OpenShift 4, and create a cluster. You learn how to:
16-
> [!div class="checklist"]
17-
> * Setup the prerequisites
18-
> * Create the required virtual network and subnets
19-
> * Deploy a cluster
15+
Azure Red Hat OpenShift is a managed OpenShift service that lets you quickly deploy and manage clusters. This article shows you how to deploy an Azure Red Hat OpenShift cluster using either Azure CLI or the Azure portal.
16+
17+
#### [Azure CLI](#tab/azure-cli)
2018

2119
## Before you begin
2220

23-
If you choose to install and use the CLI locally, this tutorial requires that you're running the Azure CLI version 2.30.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
21+
If you choose to install and use the CLI locally, you'll need to run Azure CLI version 2.30.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
2422

2523
Azure Red Hat OpenShift requires a minimum of 40 cores to create and run an OpenShift cluster. The default Azure resource quota for a new Azure subscription doesn't meet this requirement. To request an increase in your resource limit, see [Standard quota: Increase limits by VM series](../azure-portal/supportability/per-vm-quota-requests.md).
2624

@@ -35,7 +33,7 @@ Azure Red Hat OpenShift requires a minimum of 40 cores to create and run an Open
3533
3634
### Verify your permissions
3735
38-
During this tutorial, you'll create a resource group, which contains the virtual network for the cluster. To do this, you'll need Contributor and User Access Administrator permissions or Owner permissions, either directly on the virtual network or on the resource group or subscription containing it.
36+
In this article, you'll create a resource group which contains the virtual network for the cluster. To do this, you'll need Contributor and User Access Administrator permissions or Owner permissions, either directly on the virtual network or on the resource group or subscription containing it.
3937
4038
You'll also need sufficient Microsoft Entra permissions (either a member user of the tenant, or a guest assigned with role **Application administrator**) for the tooling to create an application and service principal on your behalf for the cluster. See [Member and guests](../active-directory/fundamentals/users-default-permissions.md#member-and-guest-users) and [Assign administrator and non-administrator roles to users with Microsoft Entra ID](../active-directory/fundamentals/active-directory-users-assign-role-azure-portal.md) for more details.
4139
@@ -242,13 +240,71 @@ az aro create \
242240
--version <x.y.z>
243241
```
244242

245-
## Next steps
243+
#### [Azure portal](#tab/azure-portal)
244+
245+
## Prerequisites
246+
Sign in to the [Azure portal](https://portal.azure.com).
247+
248+
Create a service principal, as explained in [Use the portal to create a Microsoft Entra application and service principal that can access resources](../active-directory/develop/howto-create-service-principal-portal.md). **Be sure to save the client ID and the appID.**
249+
250+
Register the `Microsoft.RedHatOpenShift` resource provider. For instructions on registering resource providers using Azure portal, see [Register resource provider](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider).
251+
252+
## Create an Azure Red Hat OpenShift cluster
253+
1. On the Azure portal menu or from the **Home** page, select **All Services** under three horizontal bars on the top left hand page.
254+
2. Search for and select **Azure Red Hat OpenShift clusters**.
255+
3. Select **Create**.
256+
4. On the **Basics** tab, configure the following options:
257+
* **Project details**:
258+
* Select an Azure **Subscription**.
259+
* Select or create an Azure **Resource group**, such as *myResourceGroup*.
260+
* **Instance details**:
261+
* Select a **Region** for the Azure Red Hat OpenShift cluster.
262+
* Enter an **OpenShift cluster name**, such as *myAROCluster*.
263+
* Enter a **Domain name**.
264+
* Select **Master VM Size** and **Worker VM Size**.
265+
* Select **Worker node count** (i.e., the number of worker nodes to create).
266+
267+
> [!div class="mx-imgBorder"]
268+
> [ ![**Basics** tab on Azure portal](./media/Basics.png) ](./media/Basics.png#lightbox)
269+
270+
> [!NOTE]
271+
> The **Domain name** field is pre-populated with a random string. You can either specify a domain name (e.g., *example.com*) or a string/prefix (e.g., *abc*) that will be used as part of the auto-generated DNS name for OpenShift console and API servers. This prefix is also used as part of the name of the resource group that is created to host the cluster VMs if a resource group name is not specified.
272+
273+
5. On the **Authentication** tab, complete the following sections.
274+
275+
Under **Service principal information**, select either **Create new** or **Existing**. If you choose to use an existing service principal, enter the following information:
276+
277+
- **Service principal client ID** is your appId.
278+
- **Service principal client secret** is the service principal's decrypted Secret value.
246279

247-
In this part of the tutorial, you learned how to:
248-
> [!div class="checklist"]
249-
> * Set up the prerequisites and create the required virtual network and subnets
250-
> * Deploy a cluster
280+
> [!NOTE]
281+
> If you need to create a service principal, see [Creating and using a service principal with an Azure Red Hat OpenShift cluster](howto-create-service-principal.md).
282+
283+
Under **Pull secret**, enter the **Red Hat pull secret** (i.e., your cluster's pull secret's decrypted value). If you don't have a pull secret, leave this field blank.
284+
285+
:::image type="content" source="./media/openshift-service-principal-portal.png" alt-text="Screenshot that shows how to use the Authentication tab with Azure portal to create a service principal." lightbox="./media/openshift-service-principal-portal.png":::
286+
287+
6. On the **Networking** tab, configure the required options.
288+
289+
**Note**: Azure Red Hat OpenShift clusters running OpenShift 4 require a virtual network with two empty subnets: one for the control plane and one for worker nodes.
290+
291+
> [!div class="mx-imgBorder"]
292+
> [ ![**Networking** tab on Azure portal](./media/Networking.png) ](./media/Networking.png#lightbox)
293+
294+
7. On the **Tags** tab, add tags to organize your resources.
295+
296+
> [!div class="mx-imgBorder"]
297+
> [ ![**Tags** tab on Azure portal](./media/Tags.png) ](./media/Tags.png#lightbox)
298+
299+
8. Check **Review + create** and then **Create** when validation completes.
300+
301+
![**Review + create** tab on Azure portal](./media/Review+Create.png)
302+
303+
9. It takes approximately 35 to 45 minutes to create the Azure Red Hat OpenShift cluster. When your deployment is complete, navigate to your resource by either:
304+
* Clicking **Go to resource**, or
305+
* Browsing to the Azure Red Hat OpenShift cluster resource group and selecting the Azure Red Hat OpenShift resource.
306+
* Per example cluster dashboard below: browsing for *myResourceGroup* and selecting *myAROCluster* resource.
307+
308+
## Next steps
251309

252-
Advance to the next tutorial:
253-
> [!div class="nextstepaction"]
254-
> [Connect to an Azure Red Hat OpenShift cluster](tutorial-connect-cluster.md)
310+
Learn how to [connect to an Azure Red Hat OpenShift cluster](tutorial-connect-cluster.md).
Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
---
2-
title: Tutorial - Delete an Azure Red Hat OpenShift cluster
3-
description: In this tutorial, learn how to delete an Azure Red Hat OpenShift cluster using the Azure CLI
2+
title: Delete an Azure Red Hat OpenShift cluster
3+
description: Learn how to delete an Azure Red Hat OpenShift cluster using the Azure CLI.
44
author: johnmarco
55
ms.custom: fasttrack-edit, devx-track-azurecli
66
ms.author: johnmarc
7-
ms.topic: tutorial
7+
ms.topic: article
88
ms.service: azure-redhat-openshift
9-
ms.date: 04/24/2020
9+
ms.date: 06/12/2024
1010
#Customer intent: As a developer, I want learn how to create an Azure Red Hat OpenShift cluster, scale it, and then clean up resources so that I am not charged for what I'm not using.
1111
---
1212

13-
# Tutorial: Delete an Azure Red Hat OpenShift 4 cluster
13+
# Delete an Azure Red Hat OpenShift 4 cluster
1414

15-
In this tutorial, part three of three, an Azure Red Hat OpenShift cluster running OpenShift 4 is deleted. You learn how to:
16-
17-
> [!div class="checklist"]
18-
> * Delete an Azure Red Hat OpenShift cluster
15+
This article shows you how to delete an Azure Red Hat OpenShift cluster.
1916

2017

2118
## Before you begin
2219

23-
In previous tutorials, an Azure Red Hat OpenShift cluster was created and connected to using the OpenShift web console. If you have not done these steps, and would like to follow along, start with [Tutorial 1 - Create an Azure Red Hat Openshift 4 Cluster.](tutorial-create-cluster.md)
24-
25-
If you choose to install and use the CLI locally, this tutorial requires that you are running the Azure CLI version 2.6.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
20+
This article requires Azure CLI version 2.6.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
2621

2722
## Sign in to Azure
2823

@@ -36,7 +31,7 @@ If you have access to multiple subscriptions, run `az account set -s {subscripti
3631

3732
## Delete the cluster
3833

39-
In previous tutorials, the following variable was set:
34+
In previous articles for [creating](tutorial-create-cluster.md) and [connecting](tutorial-connect-cluster.md) a cluster, the following variable was set:
4035

4136
```bash
4237
RESOURCEGROUP=yourresourcegroup
@@ -52,8 +47,4 @@ You'll then be prompted to confirm if you are sure you want to perform this oper
5247

5348
## Next steps
5449

55-
In this part of the tutorial, you learned how to:
56-
> [!div class="checklist"]
57-
> * Delete an Azure Red Hat OpenShift 4 cluster
58-
59-
Learn more about using OpenShift with the official [Red Hat OpenShift documentation](https://docs.openshift.com/container-platform/4.6/welcome/index.html)
50+
Learn more about using OpenShift with the official [Red Hat OpenShift documentation](https://docs.openshift.com/container-platform/4.6/welcome/index.html).

0 commit comments

Comments
 (0)