Skip to content

Commit 1326416

Browse files
authored
Merge pull request #255946 from MicrosoftDocs/main
10/23/2023 PM Publish
2 parents bd8b660 + a7b92b8 commit 1326416

File tree

630 files changed

+1166
-4320
lines changed

Some content is hidden

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

630 files changed

+1166
-4320
lines changed

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ To change your pricing tier, follow these steps:
113113
1. Sign in to the [Azure portal](https://portal.azure.com/).
114114

115115
1. Make sure you're using the Microsoft Entra directory that contains the subscription your Azure B2C tenant and not the Azure AD B2C tenant itself:
116-
1. In the Azure portal toolbar, select the **Directories + subscriptions** (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::) icon.
116+
1. In the Azure portal toolbar, select the **Directories + subscriptions** icon.
117117

118118
1. On the **Portal settings | Directories + subscriptions** page, find your Microsoft Entra directory in the **Directory name** list, and then select **Switch** button next to it.
119119

articles/active-directory-b2c/find-help-open-support-ticket.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you're unable to find answers by using self-help resources, you can open an o
3939

4040
1. Make sure you're using the Microsoft Entra tenant that contains your Azure subscription:
4141

42-
1. In the Azure portal toolbar, select the **Directories + subscriptions** (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::) icon.
42+
1. In the Azure portal toolbar, select the **Directories + subscriptions** icon.
4343

4444
1. On the **Portal settings | Directories + subscriptions** page, find your Microsoft Entra directory in the **Directory name** list, and then select **Switch** button next to it.
4545

articles/active-directory-b2c/index.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,6 @@ highlightedContent:
4545

4646

4747
## BAND 2 ####################################################################################################################################################
48-
productDirectory:
49-
sections:
50-
- title: Authenticate and authorize for any app type
51-
summary: Select the app type that you want to build to access documentation focusing on it.
52-
items:
53-
## ROW 1 ######################
54-
- title: Single-page app (SPA)
55-
url: index-spa.yml
56-
imageSrc: ../active-directory/develop/media/hub/app-type-spa.svg
57-
summary: A web application whose code is downloaded and run in the browser itself such as vanilla JavaScript, React and Angular.
58-
- title: Web app
59-
url: index-web-app.yml
60-
#url: web-app-quickstart.md
61-
imageSrc: ../active-directory/develop/media/hub/app-type-web.svg
62-
summary: A web app whose code runs on a server, returning page data for the browser to render such as Node.js, ASP.NET or Java.
63-
- title: Web API
64-
url: index-web-api.yml
65-
#url: web-api-quickstart.md
66-
imageSrc: ../active-directory/develop/media/hub/app-type-api.svg
67-
summary: A RESTful web service that is accessed by any app type or other web APIs, and is protected by Azure AD B2C.
68-
## ROW 2 ######################
69-
- title: Desktop app
70-
url: index-desktop.yml
71-
#url: desktop-app-quickstart.md
72-
imageSrc: ../active-directory/develop/media/hub/app-type-desktop.svg
73-
summary: Applications with a user interface (UI) whose code runs on a user's desktop, laptop, or notebook computer such as Windows OS.
74-
- title: Mobile app
75-
url: index-mobile.yml
76-
#url: mobile-app-quickstart.md
77-
imageSrc: ../active-directory/develop/media/hub/app-type-mobile.svg
78-
summary: Applications with a UI whose code runs on a user's phone, tablet, or other mobile device such as Android and iOS.
79-
- title: Back-end service or daemon
80-
url: index-service.yml
81-
#url: mobile-app-quickstart.md
82-
imageSrc: ../active-directory/develop/media/hub/app-type-daemon-console.svg
83-
summary: An application or script without a UI that performs non-interactive tasks like server-to-server communication or scheduled jobs.
8448
## BAND 2 - PRODUCT DIRECTORY END ##########################################################################################################################
8549

8650

@@ -341,12 +305,6 @@ tools:
341305
- title: MSAL.NET
342306
url: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet
343307
imageSrc: https://docs.microsoft.com/media/logos/logo_Csharp.svg
344-
- title: MSAL Android
345-
url: https://github.com/AzureAD/microsoft-authentication-library-for-android
346-
imageSrc: ../active-directory/develop/media/hub/android.svg
347-
- title: MSAL Angular
348-
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular
349-
imageSrc: ../active-directory/develop/media/hub/angular.svg
350308
## ROW 2 ######################
351309
- title: MSAL iOS
352310
url: https://github.com/AzureAD/microsoft-authentication-library-for-objc
@@ -358,13 +316,7 @@ tools:
358316
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-browser
359317
imageSrc: https://docs.microsoft.com/media/logos/logo_js.svg
360318
## ROW 3 ######################
361-
- title: MSAL Node
362-
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node
363-
imageSrc: ../active-directory/develop/media/hub/node.svg
364319
- title: MSAL Python
365320
url: https://github.com/AzureAD/microsoft-authentication-library-for-python
366321
imageSrc: https://docs.microsoft.com/media/logos/logo_python.svg
367-
- title: MSAL React
368-
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react
369-
imageSrc: ../active-directory/develop/media/hub/react.svg
370322
## BAND 4 - TOOLS END #######################################################################################################################################

articles/active-directory-b2c/tutorial-create-tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Before you create your Azure AD B2C tenant, you need to take the following consi
5151

5252
1. Make sure you're using the Microsoft Entra tenant that contains your subscription:
5353

54-
1. In the Azure portal toolbar, select the **Directories + subscriptions** (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::) icon.
54+
1. In the Azure portal toolbar, select the **Directories + subscriptions** icon.
5555

5656
1. On the **Portal settings | Directories + subscriptions** page, find your Microsoft Entra directory that contains your subscription in the **Directory name** list, and then select **Switch** button next to it.
5757

@@ -99,7 +99,7 @@ Azure AD B2C allows you to activate Go-Local add-on on an existing tenant as lon
9999

100100
1. Make sure you're using the directory that contains your Azure AD B2C tenant:
101101

102-
1. In the Azure portal toolbar, select the **Directories + subscriptions** (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::) icon.
102+
1. In the Azure portal toolbar, select the **Directories + subscriptions** icon.
103103

104104
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select the **Switch** button next to it.
105105

@@ -116,7 +116,7 @@ Azure AD B2C allows you to activate Go-Local add-on on an existing tenant as lon
116116
## Select your B2C tenant directory
117117

118118
To start using your new Azure AD B2C tenant, you need to switch to the directory that contains the tenant:
119-
1. In the Azure portal toolbar, select the **Directories + subscriptions** filter icon (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::).
119+
1. In the Azure portal toolbar, select the **Directories + subscriptions** filter icon.
120120
1. On the **All Directories** tab, find the directory that contains your Azure AD B2C tenant and then select the **Switch** button next to it.
121121

122122
If at first you don't see your new Azure B2C tenant in the list, refresh your browser window or sign out and sign back in. Then in the Azure portal toolbar, select the **Directories + subscriptions** filter again.

articles/ai-services/openai/encrypt-data-at-rest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ To delete the individual versions of a key, run the [az-keyvault-key-delete](/cl
121121

122122
```azurecli
123123
az keyvault key delete \
124-
--name <key-vault-name> \
125-
--object-id $identityPrincipalID \
124+
--vault-name <key-vault-name> \
125+
--id <key-ID>
126126
```
127127

128128
> [!IMPORTANT]

articles/ai-services/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure AI services
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure AI services. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 10/18/2023
4+
ms.date: 10/23/2023
55
ms.topic: sample
66
author: PatrickFarley
77
ms.author: pafarley

articles/aks/TOC.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,16 @@
449449
href: use-psa.md
450450
- name: Secrets Store CSI Driver
451451
items:
452-
- name: Secrets Store CSI Driver configuration
453-
href: csi-secrets-store-driver.md
454-
- name: Provide Azure Key Vault access
455-
href: csi-secrets-store-identity-access.md
456452
- name: Configure TLS for NGINX ingress controller
457453
href: csi-secrets-store-nginx-tls.md
454+
- name: Azure Key Vault provider with Secrets Store CSI Driver
455+
items:
456+
- name: 1 - Configure Secrets Store CSI Driver
457+
href: csi-secrets-store-driver.md
458+
- name: 2 - Provide Azure Key Vault access
459+
href: csi-secrets-store-identity-access.md
460+
- name: 3 - Apply extra configurations or perform troubleshooting
461+
href: csi-secrets-store-configuration-options.md
458462
- name: Configure networking
459463
items:
460464
- name: Create or use existing virtual network

articles/aks/app-routing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The following extra add-on is required:
100100
- **azure-keyvault-secrets-provider**: The Secret Store CSI provider for Azure Key Vault is required to retrieve the certificates from Azure Key Vault.
101101
102102
> [!IMPORTANT]
103-
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should to enable the [secret autorotation feature](./csi-secrets-store-driver.md#enable-and-disable-autorotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
103+
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should enable the [secret autorotation feature](./csi-secrets-store-configuration-options.md#enable-and-disable-auto-rotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
104104
105105
### Enable application routing on a new cluster
106106
@@ -126,7 +126,7 @@ The following extra add-ons are required:
126126
- **open-service-mesh**: If you require encrypted intra cluster traffic (recommended) between the nginx ingress and your services, the Open Service Mesh add-on is required which provides mutual TLS (mTLS).
127127
128128
> [!IMPORTANT]
129-
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should to enable the [secret autorotation feature](./csi-secrets-store-driver.md#enable-and-disable-autorotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
129+
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should enable the [secret autorotation feature](./csi-secrets-store-configuration-options.md#enable-and-disable-auto-rotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
130130
131131
### Enable application routing on a new cluster
132132
@@ -157,7 +157,7 @@ The following extra add-on is required:
157157
- **azure-keyvault-secrets-provider**: The Secret Store CSI provider for Azure Key Vault is required to retrieve the certificates from Azure Key Vault.
158158
159159
> [!IMPORTANT]
160-
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should to enable the [secret autorotation feature](./csi-secrets-store-driver.md#enable-and-disable-autorotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
160+
> To enable the add-on to reload certificates from Azure Key Vault when they change, you should enable the [secret autorotation feature](./csi-secrets-store-configuration-options.md#enable-and-disable-auto-rotation) of the Secret Store CSI driver with the `--enable-secret-rotation` argument. When the autorotation is enabled, the driver updates the pod mount and the Kubernetes secret by polling for changes periodically, based on the rotation poll interval you can define. The default rotation poll interval is two minutes.
161161
162162
### Enable application routing on a new cluster
163163
@@ -621,7 +621,7 @@ If you haven't configured Azure DNS integration, you need to configure your own
621621
az aks disable-addons --addons web_application_routing --name myAKSCluster --resource-group myResourceGroup
622622
```
623623
624-
When the application routing add-on is disabled, some Kubernetes resources may remain in the cluster. These resources include *configMaps* and *secrets* and are created in the *app-routing-system* namespace. You can remove these resources if you want.
624+
When the application routing add-on is disabled, some Kubernetes resources might remain in the cluster. These resources include *configMaps* and *secrets* and are created in the *app-routing-system* namespace. You can remove these resources if you want.
625625
626626
<!-- LINKS - internal -->
627627
[az-aks-create]: /cli/azure/aks#az-aks-create

0 commit comments

Comments
 (0)