Skip to content

Commit cbde43f

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Padmalathas-HBv3-Media-Replacements
2 parents 533b48d + 6fcfeba commit cbde43f

File tree

109 files changed

+1493
-1204
lines changed

Some content is hidden

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

109 files changed

+1493
-1204
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4256,6 +4256,11 @@
42564256
"redirect_url": "/azure/active-directory/external-identities/user-token",
42574257
"redirect_document_id": true
42584258
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/certificate-authorities.md",
4261+
"redirect_url": "/azure/security/fundamentals/azure-CA-details",
4262+
"redirect_document_id": true
4263+
},
42594264
{
42604265
"source_path_from_root": "/articles/active-directory/b2b/what-is-b2b.md",
42614266
"redirect_url": "/azure/active-directory/external-identities/what-is-b2b",

articles/active-directory/fundamentals/certificate-authorities.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

articles/active-directory/fundamentals/how-to-customize-branding.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ The branding elements are called out in the following example. Text descriptions
5555

5656
1. **Favicon**: Small icon that appears on the left side of the browser tab.
5757
1. **Header logo**: Space across the top of the web page, below the web browser navigation area.
58-
1. **Background image** and **page background color**: The entire space behind the sign-in box.
58+
1. **Background image**: The entire space behind the sign-in box.
59+
1. **Page background color**: The entire space behind the sign-in box.
5960
1. **Banner logo**: The logo that appears in the upper-left corner of the sign-in box.
6061
1. **Username hint and text**: The text that appears before a user enters their information.
6162
1. **Sign-in page text**: Additional text you can add below the username field.

articles/active-directory/fundamentals/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,6 @@ items:
277277
href: ../develop/howto-build-services-resilient-to-metadata-refresh.md?toc=/azure/active-directory/fundamentals/toc.json
278278
- name: Monitor application health for resilience
279279
href: monitor-sign-in-health-for-resilience.md
280-
- name: Certificate authorities used in Azure
281-
href: certificate-authorities.md
282280
- name: Secure with Azure Active Directory
283281
items:
284282
- name: Introduction

articles/app-service/quickstart-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ adobe-target-content: ./quickstart-java-uiex
4444
## Next steps
4545

4646
> [!div class="nextstepaction"]
47-
> [Connect to Azure DB for PostgreSQL with Java](../postgresql/connect-java.md)
47+
> [Connect to Azure Database for PostgreSQL with Java](../postgresql/connect-java.md)
4848
4949
> [!div class="nextstepaction"]
5050
> [Set up CI/CD](deploy-continuous-deployment.md)

articles/azure-arc/kubernetes/tutorial-akv-secrets-provider.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
title: Use Azure Key Vault Secrets Provider extension to fetch secrets into Azure Arc-enabled Kubernetes clusters
33
description: Learn how to set up the Azure Key Vault Provider for Secrets Store CSI Driver interface as an extension on Azure Arc enabled Kubernetes cluster
44
ms.custom: ignite-2022, devx-track-azurecli
5-
ms.date: 03/06/2023
6-
ms.topic: tutorial
7-
author: mayurigupta13
8-
ms.author: mayg
5+
ms.date: 04/21/2023
6+
ms.topic: how-to
97
---
108

119
# Use the Azure Key Vault Secrets Provider extension to fetch secrets into Azure Arc-enabled Kubernetes clusters
@@ -40,7 +38,7 @@ Capabilities of the Azure Key Vault Secrets Provider extension include:
4038
4139
## Install the Azure Key Vault Secrets Provider extension on an Arc-enabled Kubernetes cluster
4240

43-
You can install the Azure Key Vault Secrets Provider extension on your connected cluster in the Azure portal, by using Azure CLI, or by deploying ARM template.
41+
You can install the Azure Key Vault Secrets Provider extension on your connected cluster in the Azure portal, by using Azure CLI, or by deploying an ARM template.
4442

4543
> [!TIP]
4644
> If the cluster is behind an outbound proxy server, ensure that you connect it to Azure Arc using the [proxy configuration](quickstart-connect-cluster.md#connect-using-an-outbound-proxy-server) option before installing the extension.
@@ -76,7 +74,7 @@ You can install the Azure Key Vault Secrets Provider extension on your connected
7674
az k8s-extension create --cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.AzureKeyVaultSecretsProvider --name akvsecretsprovider
7775
```
7876

79-
You should see output similar to this example. Note that it may take several minutes before the secrets provider Helm chart is deployed to the cluster.
77+
You should see output similar to this example. It may take several minutes before the secrets provider Helm chart is deployed to the cluster.
8078

8179
```json
8280
{
@@ -252,7 +250,7 @@ You should see output similar to this example.
252250

253251
## Create or select an Azure Key Vault
254252

255-
Next, specify the Azure Key Vault to use with your connected cluster. If you don't already have one, create a new Key Vault by using the following commands. Keep in mind that the name of your Key Vault must be globally unique.
253+
Next, specify the Azure Key Vault to use with your connected cluster. If you don't already have one, create a new Key Vault by using the following commands. Keep in mind that the name of your key vault must be globally unique.
256254

257255
Set the following environment variables:
258256

@@ -262,7 +260,7 @@ export AZUREKEYVAULT_NAME=<AKV-name>
262260
export AZUREKEYVAULT_LOCATION=<AKV-location>
263261
```
264262

265-
Next, run the following command
263+
Next, run the following command:
266264

267265
```azurecli
268266
az keyvault create -n $AZUREKEYVAULT_NAME -g $AKV_RESOURCE_GROUP -l $AZUREKEYVAULT_LOCATION
@@ -367,7 +365,7 @@ Currently, the Secrets Store CSI Driver on Arc-enabled clusters can be accessed
367365

368366
After the pod starts, the mounted content at the volume path specified in your deployment YAML is available.
369367

370-
```Bash
368+
```bash
371369
## show secrets held in secrets-store
372370
kubectl exec busybox-secrets-store-inline -- ls /mnt/secrets-store/
373371

@@ -384,7 +382,7 @@ The following configuration settings are frequently used with the Azure Key Vaul
384382
| Configuration Setting | Default | Description |
385383
| --------- | ----------- | ----------- |
386384
| enableSecretRotation | false | Boolean type. If `true`, periodically updates the pod mount and Kubernetes Secret with the latest content from external secrets store |
387-
| rotationPollInterval | 2m | If `enableSecretRotation` is `true`, specifies the secret rotation poll interval duration. This duration can be adjusted based on how frequently the mounted contents for all pods and Kubernetes secrets need to be resynced to the latest. |
385+
| rotationPollInterval | 2 m | If `enableSecretRotation` is `true`, specifies the secret rotation poll interval duration. This duration can be adjusted based on how frequently the mounted contents for all pods and Kubernetes secrets need to be resynced to the latest. |
388386
| syncSecret.enabled | false | Boolean input. In some cases, you may want to create a Kubernetes Secret to mirror the mounted content. If `true`, `SecretProviderClass` allows the `secretObjects` field to define the desired state of the synced Kubernetes Secret objects. |
389387

390388
These settings can be specified when the extension is installed by using the `az k8s-extension create` command:
@@ -405,7 +403,6 @@ You can use other configuration settings as needed for your deployment. For exam
405403
az k8s-extension create --cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.AzureKeyVaultSecretsProvider --name akvsecretsprovider --configuration-settings linux.kubeletRootDir=/path/to/kubelet secrets-store-csi-driver.linux.kubeletRootDir=/path/to/kubelet
406404
```
407405

408-
409406
## Uninstall the Azure Key Vault Secrets Provider extension
410407

411408
To uninstall the extension, run the following command:
@@ -425,6 +422,12 @@ az k8s-extension list --cluster-type connectedClusters --cluster-name $CLUSTER_N
425422

426423
If the extension was successfully removed, you won't see the Azure Key Vault Secrets Provider extension listed in the output. If you don't have any other extensions installed on your cluster, you'll see an empty array.
427424

425+
If you no longer need it, be sure to delete the Kubernetes secret associated with the service principal by running the following command:
426+
427+
```bash
428+
kubectl delete secret secrets-store-creds
429+
```
430+
428431
## Reconciliation and troubleshooting
429432

430433
The Azure Key Vault Secrets Provider extension is self-healing. If somebody tries to change or delete an extension component that was deployed when the extension was installed, that component will be reconciled to its original state. The only exceptions are for Custom Resource Definitions (CRDs). If CRDs are deleted, they won't be reconciled. To restore deleted CRDs, use the `az k8s-extension create` command again with the existing extension instance name.

articles/azure-health-insights/TOC.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@ items:
99
- name: Onco Phenotype
1010
href: ./oncophenotype/index.yml
1111
- name: Trial Matcher
12-
href: ./trial-matcher/index.yml
13-
- name: Concepts
14-
expanded: true
15-
items:
16-
- name: Request Info
17-
href: request-info.md
18-
- name: Response Info
19-
href: response-info.md
12+
href: ./trial-matcher/index.yml
2013
- name: Quickstarts
2114
expanded: true
2215
items:
@@ -26,4 +19,4 @@ items:
2619
expanded: true
2720
items:
2821
- name: Data, privacy, and security
29-
href: responsible-ai/data-privacy-security.md
22+
href: responsible-ai/data-privacy-security.md

articles/azure-health-insights/oncophenotype/TOC.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@ items:
2626
items:
2727
- name: REST API
2828
href: /rest/api/cognitiveservices/healthinsights/onco-phenotype
29-
- name: .NET SDK
30-
href: /dotnet/api/overview/azure/health.insights.cancerprofiling-readme
29+
- name: SDKs
30+
items:
31+
- name: .NET
32+
href: /dotnet/api/overview/azure/health.insights.cancerprofiling-readme
33+
- name: Java
34+
href: /java/api/overview/azure/health-insights-cancerprofiling-readme
35+
- name: Python
36+
href: /python/api/overview/azure/healthinsights-cancerprofiling-readme
3137
- name: Resources
3238
items:
3339
- name: FAQ
@@ -39,4 +45,4 @@ items:
3945
- name: Compliance and certification
4046
href: https://azure.microsoft.com/support/legal/cognitive-services-compliance-and-privacy/
4147
- name: Support and help options
42-
href: support-and-help.md
48+
href: support-and-help.md

articles/azure-health-insights/trial-matcher/TOC.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ items:
3737
items:
3838
- name: REST API
3939
href: /rest/api/cognitiveservices/healthinsights/trial-matcher
40-
- name: .NET SDK
41-
href: /dotnet/api/overview/azure/health.insights.clinicalmatching-readme
40+
- name: SDKs
41+
items:
42+
- name: .NET
43+
href: /dotnet/api/overview/azure/health.insights.clinicalmatching-readme
44+
- name: Java
45+
href: /java/api/overview/azure/health-insights-clinicalmatching-readme
46+
- name: Python
47+
href: /python/api/overview/azure/healthinsights-clinicalmatching-readme
4248
- name: Resources
4349
items:
4450
- name: Enterprise readiness

articles/azure-monitor/agents/agents-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
188188

189189
| Operating system | Azure Monitor agent | Log Analytics agent (legacy) | Diagnostics extension |
190190
|:---|:---:|:---:|:---:|
191-
| Windows Server 2022 | X | | |
191+
| Windows Server 2022 | X | X | |
192192
| Windows Server 2022 Core | X | | |
193193
| Windows Server 2019 | X | X | X |
194194
| Windows Server 2019 Core | X | | |

0 commit comments

Comments
 (0)