Skip to content

Commit f29615c

Browse files
authored
Merge pull request #174462 from MicrosoftDocs/master
10/04 AM Publish
2 parents 079426f + 1b20449 commit f29615c

File tree

185 files changed

+11208
-10953
lines changed

Some content is hidden

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

185 files changed

+11208
-10953
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 10511 additions & 10511 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/configure-authentication-sample-angular-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Before you follow the procedures in this article, make sure that your computer i
5959

6060
* [Visual Studio Code](https://code.visualstudio.com/) or another code editor.
6161
* [Node.js runtime](https://nodejs.org/en/download/) and [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).
62-
* [Angular LCI](https://angular.io/cli).
62+
* [Angular CLI](https://angular.io/cli).
6363

6464
## Step 1: Configure your user flow
6565

articles/active-directory/app-provisioning/application-provisioning-config-problem-scim-compatibility.md

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -101,33 +101,27 @@ Below are sample requests to help outline what the sync engine currently sends v
101101
"urn:ietf:params:scim:api:messages:2.0:PatchOp"
102102
],
103103
"Operations": [
104-
{
105-
"op": "Add",
106-
"path": "nickName",
107-
"value": [
108-
{
109-
"value": "Babs"
110-
}
111-
]
112-
}
113-
]
114-
}
104+
{
105+
"op": "Add",
106+
"path": "nickName",
107+
"value": "Babs"
108+
}
109+
]
110+
}
111+
115112
```
116113

117114
**With feature flag**
118115
```json
119-
{
120-
"schemas": [
121-
"urn:ietf:params:scim:api:messages:2.0:PatchOp"
122-
],
123-
"Operations": [
124-
{
125-
"op": "add",
126-
"value": {
127-
"nickName": "Babs"
128-
}
129-
}
130-
]
116+
{
117+
"schemas": ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
118+
"Operations": [
119+
{
120+
"op": "add",
121+
"path": "nickName",
122+
"value": "Babs"
123+
}
124+
]
131125
}
132126
```
133127

articles/active-directory/saas-apps/citrixgotomeeting-provisioning-tutorial.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,14 @@ This section guides you through connecting your Azure AD to GoToMeeting's user a
5454

5555
1. Set the **Provisioning** Mode to **Automatic**.
5656

57-
![Screenshot of the Provisioning tab for GoToMeeting in Azure portal. Provisioning Mode is set to Automatic and Admin Username, Password and Test Connection are highlighted.](./media/citrixgotomeeting-provisioning-tutorial/provisioning.png)
57+
![Screenshot of the Provisioning tab for GoToMeeting in Azure portal. Provisioning Mode is set to Automatic and Admin Username, Password and Test Connection are highlighted.](https://user-images.githubusercontent.com/49566142/135871050-9d63861d-7963-47e0-bbdf-0e7c947e0b41.png)
5858

59-
1. Under the Admin Credentials section, perform the following steps:
60-
61-
a. In the **GoToMeeting Admin User Name** textbox, type the user name of an administrator.
6259

63-
b. In the **GoToMeeting Admin Password** textbox, the administrator's password.
60+
1. Under the Admin Credentials section, click **Authorize** and log into GoToMeeting in pop-up windows that appears
61+
6462

6563
1. In the Azure portal, click **Test Connection** to ensure Azure AD can connect to your GoToMeeting app. If the connection fails, ensure your GoToMeeting account has Team Admin permissions and try the **"Admin Credentials"** step again.
6664

67-
1. Enter the email address of a person or group who should receive provisioning error notifications in the **Notification Email** field, and check the checkbox.
6865

6966
1. Click **Save.**
7067

@@ -84,4 +81,4 @@ For more information on how to read the Azure AD provisioning logs, see [Reporti
8481

8582
* [Managing user account provisioning for Enterprise Apps](tutorial-list.md)
8683
* [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)
87-
* [Configure Single Sign-on](./citrix-gotomeeting-tutorial.md)
84+
* [Configure Single Sign-on](./citrix-gotomeeting-tutorial.md)

articles/aks/csi-storage-drivers.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,54 @@ $ echo $(kubectl get CSINode <NODE NAME> -o jsonpath="{.spec.drivers[1].allocata
6262
8
6363
```
6464

65+
## Migrating custom in-tree storage classes to CSI
66+
If you have created custom storage classes based on the in-tree storage drivers, these will need to be migrated when you have upgraded your cluster to 1.21.x.
67+
68+
Whilst explicit migration to the CSI provider is not needed for your storage classes to still be valid, to be able to use CSI features (snapshotting etc.) you will need to carry out the migration.
69+
70+
Migration of these storage classes will involve deleting the existing storage classes, and re-provisioning them with the provisioner set to **disk.csi.azure.com** if using Azure Disks, and **files.csi.azure.com** if using Azure Files. As an example for Azure disks:
71+
72+
### Original In-tree storage class definition
73+
74+
```yaml
75+
kind: StorageClass
76+
apiVersion: storage.k8s.io/v1
77+
metadata:
78+
name: managed-premium-retain
79+
provisioner: kubernetes.io/azure-disk
80+
reclaimPolicy: Retain
81+
parameters:
82+
storageaccounttype: Premium_LRS
83+
kind: Managed
84+
```
85+
86+
### CSI storage class definition
87+
88+
```yaml
89+
kind: StorageClass
90+
apiVersion: storage.k8s.io/v1
91+
metadata:
92+
name: managed-premium-retain
93+
provisioner: disk.csi.azure.com
94+
reclaimPolicy: Retain
95+
parameters:
96+
storageaccounttype: Premium_LRS
97+
kind: Managed
98+
```
99+
100+
The CSI storage system supports the same features as the In-tree drivers, so the only change needed would be the provisioner.
101+
102+
65103
## Next steps
66104
67105
- To use the CSI drive for Azure disks, see [Use Azure disks with CSI drivers](azure-disk-csi.md).
68106
- To use the CSI drive for Azure Files, see [Use Azure Files with CSI drivers](azure-files-csi.md).
69107
- For more about storage best practices, see [Best practices for storage and backups in Azure Kubernetes Service][operator-best-practices-storage].
108+
- For more information on CSI migration, see [Kubernetes In-Tree to CSI Volume Migration][csi-migration-community].
70109
71110
<!-- LINKS - external -->
72111
[access-modes]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes
112+
[csi-migration-community]: https://kubernetes.io/blog/2019/12/09/kubernetes-1-17-feature-csi-migration-beta
73113
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply
74114
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
75115
[kubernetes-storage-classes]: https://kubernetes.io/docs/concepts/storage/storage-classes/

articles/api-management/api-management-cross-domain-policies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use the `cross-domain` policy to make the API accessible from Adobe Flash and Mi
3232
```xml
3333
<cross-domain>
3434
<!-Policy configuration is in the Adobe cross-domain policy file format,
35-
see https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html-->
35+
see https://www.adobe.com/devnet-docs/acrobatetk/tools/AppSec/CrossDomain_PolicyFile_Specification.pdf-->
3636
</cross-domain>
3737
```
3838

@@ -48,7 +48,7 @@ Use the `cross-domain` policy to make the API accessible from Adobe Flash and Mi
4848

4949
|Name|Description|Required|
5050
|----------|-----------------|--------------|
51-
|cross-domain|Root element. Child elements must conform to the [Adobe cross-domain policy file specification](https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html).|Yes|
51+
|cross-domain|Root element. Child elements must conform to the [Adobe cross-domain policy file specification](https://www.adobe.com/devnet-docs/acrobatetk/tools/AppSec/CrossDomain_PolicyFile_Specification.pdf).|Yes|
5252

5353
### Usage
5454
This policy can be used in the following policy [sections](./api-management-howto-policies.md#sections) and [scopes](./api-management-howto-policies.md#scopes).

articles/api-management/api-management-howto-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In this article, you'll learn how to:
8686

8787
> [!NOTE]
8888
> You can specify multiple domains in the **Allowed Tenants** section. A global administration must grant the application access to directory data before users can sign in from a different domain than the original app registration domain. To grant permission, the global administrator should:
89-
> 1. Go to `https://<URL of your developer portal>/aadadminconsent` (for example, https://contoso.portal.azure-api.net/aadadminconsent).
89+
> 1. Go to `https://<URL of your developer portal>/aadadminconsent` (for example, `https://contoso.portal.azure-api.net/aadadminconsent`).
9090
> 1. Enter the domain name of the Azure AD tenant to which they want to grant access.
9191
> 1. Select **Submit**.
9292

0 commit comments

Comments
 (0)