Skip to content

Commit 033ad28

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/learn-pr into introduction-to-migrating-gcp-to-azure
2 parents e1b1815 + 3330ff3 commit 033ad28

File tree

303 files changed

+4623
-4407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+4623
-4407
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42313,6 +42313,41 @@
4231342313
"redirect_url": "/training/modules/security-monitoring-automation-solutions/11-summary",
4231442314
"redirect_document_id": false
4231542315
},
42316+
{
42317+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/1-introduction.yml",
42318+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42319+
"redirect_document_id": false
42320+
},
42321+
{
42322+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/2-what-is-azure-sql-edge.yml",
42323+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42324+
"redirect_document_id": false
42325+
},
42326+
{
42327+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/3-how-azure-sql-edge-works.yml",
42328+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42329+
"redirect_document_id": false
42330+
},
42331+
{
42332+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/4-when-to-use-azure-sql-edge.yml",
42333+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42334+
"redirect_document_id": false
42335+
},
42336+
{
42337+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/5-knowledge-check.yml",
42338+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42339+
"redirect_document_id": false
42340+
},
42341+
{
42342+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/6-summary.yml",
42343+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42344+
"redirect_document_id": false
42345+
},
42346+
{
42347+
"source_path": "learn-pr/azure/intro-to-azure-sql-edge/index.yml",
42348+
"redirect_url": "https://learn.microsoft.com/azure/azure-sql-edge/overview",
42349+
"redirect_document_id": false
42350+
},
4231642351
{
4231742352
"source_path": "learn-pr/sqlserver/deploy-sql-server-linux/1-introduction.yml",
4231842353
"redirect_url": "https://learn.microsoft.com//training/modules/introduction-sql-server-linux/",

learn-pr/achievements.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5120,6 +5120,11 @@ achievements:
51205120
title: Manage device identity with Microsoft Entra join and Enterprise State Roaming
51215121
summary: Evaluate options to manage device identities in Microsoft Entra ID. Allow users to join devices in Microsoft Entra ID. Require devices to be marked as compliant. Enable Enterprise State Roaming.
51225122
iconUrl: /training/achievements/manage-device-identity-ad-join.svg
5123+
- uid: learn.intro-to-azure-sql-edge.badge
5124+
type: badge
5125+
title: Introduction to Azure SQL Edge
5126+
summary: Describe how Azure SQL Edge enables developers to use the same Transact-SQL (T-SQL) API to develop apps for the edge. Evaluate whether Azure SQL Edge provides the same security and performance as Microsoft SQL Server.
5127+
iconUrl: /training/achievements/generic-badge.svg
51235128
- uid: learn-sqlserver.deploying-sql-server-linux.badge
51245129
type: badge
51255130
title: Deploy SQL Server on Linux

learn-pr/azure/aks-deploy-container-app/1-introduction.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### YamlMime:ModuleUnit
22
uid: learn.aks-deploy-container-app.1-introduction
3-
metadata:
4-
adobe-target: true
3+
metadata:
4+
adobe-target: true
55
prefetch-feature-rollout: true
66
title: Introduction
77
description: Introduction
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/2-create-aks-cluster.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### YamlMime:ModuleUnit
22
uid: learn.aks-deploy-container-app.2-create-aks-cluster
3-
metadata:
4-
adobe-target: true
3+
metadata:
4+
adobe-target: true
55
prefetch-feature-rollout: true
66
title: Create an Azure Kubernetes Service cluster
77
description: Explore some of the architectural concepts you need to consider when you configure your first Azure Kubernetes Service cluster. You'll review concepts such as common cluster architecture and application routing.
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/3-exercise-create-aks-cluster.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### YamlMime:ModuleUnit
22
uid: learn.aks-deploy-container-app.3-exercise-create-aks-cluster
3-
metadata:
4-
adobe-target: true
3+
metadata:
4+
adobe-target: true
55
prefetch-feature-rollout: true
66
title: Exercise - Create an Azure Kubernetes Service cluster
77
description: In this exercise, you'll create an Azure Kubernetes Service cluster using Azure CLI and configure access from the Cloud Shell to your new cluster using Kubectl.
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/4-deploy-app.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### YamlMime:ModuleUnit
22
uid: learn.aks-deploy-container-app.4-deploy-app
3-
metadata:
4-
adobe-target: true
3+
metadata:
4+
adobe-target: true
55
prefetch-feature-rollout: true
66
title: Deploy an application on your Azure Kubernetes Service cluster
77
description: Explore the concepts needed to create and deploy an application to your Azure Kubernetes Service cluster. You'll see how to deploy an application as a container from a container registry by using a declarative manifest file.
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/5-exercise-deploy-app.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### YamlMime:ModuleUnit
22
uid: learn.aks-deploy-container-app.5-exercise-deploy-app
3-
metadata:
4-
adobe-target: true
3+
metadata:
4+
adobe-target: true
55
prefetch-feature-rollout: true
66
title: Exercise - Deploy an application on your Azure Kubernetes Service cluster
77
description: In this exercise, you'll create and push a Kubernetes workload to an Azure Container Registry instance. You'll then deploy the workload from the container registry to an Azure Kubernetes Service cluster by creating a deployment manifest file.
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/6-summary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
title: Summary
77
description: Summary
88
ms.published: 07/31/2020
9-
ms.date: 04/04/2023
9+
ms.date: 01/31/2025
1010
author: nickomang
1111
ms.author: nickoman
1212
ms.topic: unit

learn-pr/azure/aks-deploy-container-app/includes/1-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ By the end of this module, you can:
1616
- Familiarity with Kubernetes concepts. If you're new to Kubernetes, start with the [basics of Kubernetes](https://azure.microsoft.com/topic/what-is-kubernetes/?azure-portal=true).
1717
- Familiarity with [Git](/contribute/git-github-fundamentals) and [GitHub](https://github.com).
1818
- Familiarity with [Docker](https://docker.com) and Docker images.
19-
- An active Azure [subscription](https://azure.microsoft.com/free/services/kubernetes-service/?azure-portal=true).
19+
- An active Azure [subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account).
2020
- Ability to use the [Azure CLI](/azure/aks/kubernetes-walkthrough).
2121
- Ability to create a Docker container. If you're new to Docker, start with the [intro to containers](/training/modules/intro-to-containers/).
2222

learn-pr/azure/aks-deploy-container-app/includes/2-create-aks-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ There are two popular cluster architectures for Kubernetes-based deployments.
2626

2727
:::image type="content" source="../media/2-1-diagram.png" alt-text="A diagram that shows a single control plane and multiple nodes in a cluster configuration.":::
2828

29-
The *single control plane to multiple nodes* per cluster architecture is the most common architectural pattern, and is the easiest to deploy, but it doesn't provide high availability to your cluster's core management services.
29+
The *single control plane to multiple nodes* per cluster architecture is the most common architectural pattern and is the easiest to deploy, but it doesn't provide high availability to your cluster's core management services.
3030

3131
If the control plane node becomes unavailable for any reason, no other interaction can happen with the cluster. This problem occurs even if you're the operator, or by any workloads that use Kubernetes' APIs to communicate until, at least, the API server is back online.
3232

@@ -68,4 +68,4 @@ You can change the node count later in the cluster's configuration panel. It's a
6868

6969
## Node VM size
7070

71-
Select from a wide range of VM specs. For development purposes, you can choose the B series to save on costs. In the exercises, you use series B2, the standard size. For more guidance to select a VM based on your needs, visit the [Azure VM selector tool](https://azure.microsoft.com/pricing/vm-selector/)
71+
Select from a wide range of VM specs. For development purposes, you can choose the B series to save on costs. In the exercises, you use series B2, the standard size. For more guidance to select a VM based on your needs, [ask Microsoft Copilot in Azure to find the best VM](https://techcommunity.microsoft.com/blog/azurecompute/using-microsoft-copilot-in-azure-to-find-the-best-vm-size-for-you/4356049)

0 commit comments

Comments
 (0)