Skip to content

Commit 463ec64

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 8162877 + f057c10 commit 463ec64

File tree

225 files changed

+2711
-636
lines changed

Some content is hidden

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

225 files changed

+2711
-636
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27269,6 +27269,11 @@
2726927269
"source_path": "articles/cognitive-services/speech-service/speech-scenarios.md",
2727027270
"redirect_url": "/azure/cognitive-services/speech-service/overview",
2727127271
"redirect_document_id": true
27272+
},
27273+
{
27274+
"source_path": "articles/cognitive-services/luis/Home.md",
27275+
"redirect_url": "/azure/cognitive-services/luis/what-is-luis",
27276+
"redirect_document_id": true
2727227277
}
2727327278

2727427279
]

articles/active-directory/reports-monitoring/overview-activity-logs-in-azure-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ This section answers frequently asked questions and discusses known issues with
121121

122122
**Q: How much will it cost to store my data?**
123123

124-
**A**: The storage costs depend on both the size of your logs and the retention period you choose. For a list of the estimated costs for tenants, which depend on the volume of logs generated, go to the [Storage size for activity logs](https://review.docs.microsoft.com/en-us/azure/active-directory/reporting-azure-monitor-diagnostics-overview?branch=pr-en-us-47660#storage-size-for-activity-logs) section.
124+
**A**: The storage costs depend on both the size of your logs and the retention period you choose. For a list of the estimated costs for tenants, which depend on the volume of logs generated, see the [Storage size for activity logs](#storage-size-for-activity-logs) section.
125125

126126
---
127127

articles/active-directory/saas-apps/sharepoint-on-premises-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
148148
$map2 = New-SPClaimTypeMapping -IncomingClaimType "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" -IncomingClaimTypeDisplayName "GivenName" -SameAsIncoming
149149
$map3 = New-SPClaimTypeMapping -IncomingClaimType "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" -IncomingClaimTypeDisplayName "SurName" -SameAsIncoming
150150
$map4 = New-SPClaimTypeMapping -IncomingClaimType "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" -IncomingClaimTypeDisplayName "Email" -SameAsIncoming
151-
$ap = New-SPTrustedIdentityTokenIssuer -Name "AzureAD" -Description "SharePoint secured by Azure AD" -realm $realm -ImportTrustCertificate $cert -ClaimsMappings $map,$map2,$map3 -SignInUrl $wsfedurl -IdentifierClaim "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"
151+
$ap = New-SPTrustedIdentityTokenIssuer -Name "AzureAD" -Description "SharePoint secured by Azure AD" -realm $realm -ImportTrustCertificate $cert -ClaimsMappings $map,$map2,$map3,$map4 -SignInUrl $wsfedurl -IdentifierClaim "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"
152152
```
153153

154154
Next, follow these steps to enable the trusted identity provider for your application:

articles/active-directory/saas-apps/workfront-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
114114
b. In the **Identifier** textbox, type a URL using the following pattern: `https://<companyname>.attasksandbox.com/SAML2`
115115

116116
> [!NOTE]
117-
> These values are not real. Update these values with the actual Sign-On URL and Identifier. Contact [Workfront Client support team](https://www.workfront.com/contact-us/) to get these values.
117+
> These values are not real. Update these values with the actual Sign-On URL and Identifier. Contact [Workfront Client support team](https://www.workfront.com/services-and-support) to get these values.
118118

119119
1. On the **SAML Signing Certificate** section, click **Certificate(Base64)** and then save the Certificate file on your computer.
120120

articles/active-directory/user-help/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ We've created this content to help you set up and use security info, two-step ve
114114
<div class="cardText">
115115
<h3>Manage my devices help</h3>
116116
<p>
117-
<a href="/azure/active-directory/user-help/device-management-azuread-joined-devices-setup">Join my devices</a><br/>
118-
<a href="/azure/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup">Register my Windows 10 devices</a>
117+
<a href="/azure/active-directory/user-help/user-help-join-device-on-network">Join your work device</a><br/>
118+
<a href="/azure/active-directory/user-help/user-help-register-device-on-network">Register your personal device for work</a>
119119
</p>
120120
</div>
121121
</div>

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
href: kubernetes-dashboard.md
124124
- name: Troubleshoot
125125
items:
126+
- name: Common issues
127+
href: troubleshooting.md
126128
- name: SSH node access
127129
href: aks-ssh.md
128130
- name: Reference

articles/aks/azure-files-dynamic-pv.md

Lines changed: 99 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ title: Use Azure File with AKS
33
description: Use Azure Disks with AKS
44
services: container-service
55
author: iainfoulds
6-
manager: jeconnoc
76

87
ms.service: container-service
98
ms.topic: article
10-
ms.date: 05/21/2018
9+
ms.date: 08/15/2018
1110
ms.author: iainfou
12-
ms.custom: mvc
1311
---
1412

1513
# Persistent volumes with Azure files
@@ -18,33 +16,32 @@ A persistent volume is a piece of storage that has been created for use in a Kub
1816

1917
For more information on Kubernetes persistent volumes, including static creation, see [Kubernetes persistent volumes][kubernetes-volumes].
2018

21-
## Create storage account
19+
## Create a storage account
2220

23-
When dynamically creating an Azure file share as a Kubernetes volume, any storage account can be used as long as it is in the AKS **node** resource group. This is the one with the `MC_` prefix that was created by the provisioning of the resources for the AKS cluster. Get the resource group name with the [az resource show][az-resource-show] command.
21+
When dynamically creating an Azure file share as a Kubernetes volume, any storage account can be used as long as it is in the AKS **node** resource group. This group is the one with the *MC_* prefix that was created by the provisioning of the resources for the AKS cluster. Get the resource group name with the [az aks show][az-aks-show] command.
2422

25-
```azurecli-interactive
26-
$ az resource show --resource-group myResourceGroup --name myAKSCluster --resource-type Microsoft.ContainerService/managedClusters --query properties.nodeResourceGroup -o tsv
23+
```azurecli
24+
$ az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv
2725
2826
MC_myResourceGroup_myAKSCluster_eastus
2927
```
3028

3129
Use the [az storage account create][az-storage-account-create] command to create the storage account.
3230

33-
Update `--resource-group` with the name of the resource group gathered in the last step, and `--name` to a name of your choice.
31+
Update `--resource-group` with the name of the resource group gathered in the last step, and `--name` to a name of your choice. Provide your own unique storage account name:
3432

35-
```azurecli-interactive
36-
az storage account create --resource-group MC_myResourceGroup_myAKSCluster_eastus --name mystorageaccount --location eastus --sku Standard_LRS
33+
```azurecli
34+
az storage account create --resource-group MC_myResourceGroup_myAKSCluster_eastus --name mystorageaccount --sku Standard_LRS
3735
```
3836

39-
> Azure Files only currently work with standard storage. If you use premium storage, your volume will fail to provision.
37+
> [!NOTE]
38+
> Azure Files currently only work with Standard storage. If you use Premium storage, the volume fails to provision.
4039
41-
## Create storage class
40+
## Create a storage class
4241

43-
A storage class is used to define how an Azure file share is created. A specific storage account can be specified in the class. If a storage account is not specified, a `skuName` and `location` must be specified, and all storage accounts in the associated resource group are evaluated for a match.
42+
A storage class is used to define how an Azure file share is created. A storage account can be specified in the class. If a storage account is not specified, a *skuName* and *location* must be specified, and all storage accounts in the associated resource group are evaluated for a match. For more information on Kubernetes storage classes for Azure Files, see [Kubernetes Storage Classes][kubernetes-storage-classes].
4443

45-
For more information on Kubernetes storage classes for Azure files, see [Kubernetes Storage Classes][kubernetes-storage-classes].
46-
47-
Create a file named `azure-file-sc.yaml` and copy in the following manifest. Update the `storageAccount` with the name of your target storage account. See the [Mount options] section for more information on `mountOptions`.
44+
Create a file named `azure-file-sc.yaml` and copy in the following example manifest. Update the *storageAccount* value with the name of your storage account created in the previous step. For more information on *mountOptions*, see the [Mount options][mount-options] section.
4845

4946
```yaml
5047
kind: StorageClass
@@ -59,21 +56,57 @@ mountOptions:
5956
- gid=1000
6057
parameters:
6158
skuName: Standard_LRS
59+
storageAccount: mystorageaccount
6260
```
6361
64-
Create the storage class with the [kubectl apply][kubectl-apply] command.
62+
Create the storage class with the [kubectl apply][kubectl-apply] command:
6563
66-
```azurecli-interactive
64+
```console
6765
kubectl apply -f azure-file-sc.yaml
6866
```
6967

70-
## Create persistent volume claim
68+
## Create a cluster role and binding
69+
70+
AKS clusters use Kubernetes role-based access control (RBAC) to limit actions that can be performed. *Roles* define the permissions to grant, and *bindings* apply them to desired users. These assignments can be applied to a given namespace, or across the entire cluster. For more information, see [Using RBAC authorization][kubernetes-rbac].
71+
72+
To allow the Azure platform to create the required storage resources, create a *clusterrole* and *clusterrolebinding*. Create a file named `azure-pvc-roles.yaml` and copy in the following YAML:
73+
74+
```yaml
75+
---
76+
apiVersion: rbac.authorization.k8s.io/v1beta1
77+
kind: ClusterRole
78+
metadata:
79+
name: system:azure-cloud-provider
80+
rules:
81+
- apiGroups: ['']
82+
resources: ['secrets']
83+
verbs: ['get','create']
84+
---
85+
apiVersion: rbac.authorization.k8s.io/v1beta1
86+
kind: ClusterRoleBinding
87+
metadata:
88+
name: system:azure-cloud-provider
89+
roleRef:
90+
kind: ClusterRole
91+
apiGroup: rbac.authorization.k8s.io
92+
name: system:azure-cloud-provider
93+
subjects:
94+
- kind: ServiceAccount
95+
name: persistent-volume-binder
96+
namespace: kube-system
97+
```
98+
99+
Assign the permissions with the [kubectl apply][kubectl-apply] command:
100+
101+
```console
102+
kubectl apply -f azure-pvc-roles.yaml
103+
```
71104

72-
A persistent volume claim (PVC) uses the storage class object to dynamically provision an Azure file share.
105+
## Create a persistent volume claim
73106

74-
The following YAML can be used to create a persistent volume claim `5GB` in size with `ReadWriteMany` access. For more information on access modes, see the [Kubernetes persistent volume][access-modes] documentation.
107+
A persistent volume claim (PVC) uses the storage class object to dynamically provision an Azure file share. The following YAML can be used to create a persistent volume claim *5GB* in size with *ReadWriteMany* access. For more information on access modes, see the [Kubernetes persistent volume][access-modes] documentation.
75108

76-
Create a file named `azure-file-pvc.yaml` and copy in the following YAML. Make sure that the `storageClassName` matches the storage class created in the last step.
109+
Now create a file named `azure-file-pvc.yaml` and copy in the following YAML. Make sure that the *storageClassName* matches the storage class created in the last step:
77110

78111
```yaml
79112
apiVersion: v1
@@ -89,19 +122,26 @@ spec:
89122
storage: 5Gi
90123
```
91124
92-
Create the persistent volume claim with the [kubectl apply][kubectl-apply] command.
125+
Create the persistent volume claim with the [kubectl apply][kubectl-apply] command:
93126
94-
```azurecli-interactive
127+
```console
95128
kubectl apply -f azure-file-pvc.yaml
96129
```
97130

98-
Once completed, the file share will be created. A Kubernetes secret is also created that includes connection information and credentials.
131+
Once completed, the file share will be created. A Kubernetes secret is also created that includes connection information and credentials. You can use the [kubectl get][kubectl-get] command to view the status of the PVC:
132+
133+
```
134+
$ kubectl get pvc azurefile
135+
136+
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
137+
azurefile Bound pvc-8436e62e-a0d9-11e5-8521-5a8664dc0477 5Gi RWX azurefile 5m
138+
```
99139

100-
## Using the persistent volume
140+
## Use the persistent volume
101141

102-
The following YAML creates a pod that uses the persistent volume claim `azurefile` to mount the Azure file share at the `/mnt/azure` path.
142+
The following YAML creates a pod that uses the persistent volume claim *azurefile* to mount the Azure file share at the */mnt/azure* path.
103143

104-
Create a file named `azure-pvc-files.yaml`, and copy in the following YAML. Make sure that the `claimName` matches the PVC created in the last step.
144+
Create a file named `azure-pvc-files.yaml`, and copy in the following YAML. Make sure that the *claimName* matches the PVC created in the last step.
105145

106146
```yaml
107147
kind: Pod
@@ -123,15 +163,36 @@ spec:
123163
124164
Create the pod with the [kubectl apply][kubectl-apply] command.
125165
126-
```azurecli-interactive
166+
```console
127167
kubectl apply -f azure-pvc-files.yaml
128168
```
129169

130-
You now have a running pod with your Azure disk mounted in the `/mnt/azure` directory. This configuration can be seen when inspecting your pod via `kubectl describe pod mypod`.
170+
You now have a running pod with your Azure disk mounted in the */mnt/azure* directory. This configuration can be seen when inspecting your pod via `kubectl describe pod mypod`. The following condensed example output shows the volume mounted in the container:
171+
172+
```
173+
Containers:
174+
myfrontend:
175+
Container ID: docker://053bc9c0df72232d755aa040bfba8b533fa696b123876108dec400e364d2523e
176+
Image: nginx
177+
Image ID: docker-pullable://nginx@sha256:d85914d547a6c92faa39ce7058bd7529baacab7e0cd4255442b04577c4d1f424
178+
State: Running
179+
Started: Wed, 15 Aug 2018 22:22:27 +0000
180+
Ready: True
181+
Mounts:
182+
/mnt/azure from volume (rw)
183+
/var/run/secrets/kubernetes.io/serviceaccount from default-token-8rv4z (ro)
184+
[...]
185+
Volumes:
186+
volume:
187+
Type: PersistentVolumeClaim (a reference to a PersistentVolumeClaim in the same namespace)
188+
ClaimName: azurefile2
189+
ReadOnly: false
190+
[...]
191+
```
131192

132193
## Mount options
133194

134-
Default fileMode and dirMode values differ between Kubernetes versions as described in the following table.
195+
Default *fileMode* and *dirMode* values differ between Kubernetes versions as described in the following table.
135196

136197
| version | value |
137198
| ---- | ---- |
@@ -141,7 +202,7 @@ Default fileMode and dirMode values differ between Kubernetes versions as descri
141202
| v1.9.0 | 0700 |
142203
| v1.9.1 or above | 0755 |
143204

144-
If using a cluster of version 1.8.5 or greater and dynamically creating the persistant volume with a storage class, mount options can be specified on the storage class object. The following example sets `0777`.
205+
If using a cluster of version 1.8.5 or greater and dynamically creating the persistent volume with a storage class, mount options can be specified on the storage class object. The following example sets *0777*:
145206

146207
```yaml
147208
kind: StorageClass
@@ -158,7 +219,7 @@ parameters:
158219
skuName: Standard_LRS
159220
```
160221
161-
If using a cluster of version 1.8.5 or greater and statically creating the persistant volume object, mount options need to be specified on the `PersistentVolume` object. for more information on statically creating a persistant volume, see [Static Persistent Volumes][pv-static].
222+
If using a cluster of version 1.8.5 or greater and statically creating the persistent volume object, mount options need to be specified on the *PersistentVolume* object. for more information on statically creating a persistent volume, see [Static Persistent Volumes][pv-static].
162223
163224
```yaml
164225
apiVersion: v1
@@ -181,7 +242,7 @@ spec:
181242
- gid=1000
182243
```
183244
184-
If using a cluster of version 1.8.0 - 1.8.4, a security context can be specified with the `runAsUser` value set to `0`. For more information on Pod security context, see [Configure a Security Context][kubernetes-security-context].
245+
If using a cluster of version 1.8.0 - 1.8.4, a security context can be specified with the *runAsUser* value set to *0*. For more information on Pod security context, see [Configure a Security Context][kubernetes-security-context].
185246
186247
## Next steps
187248
@@ -193,18 +254,20 @@ Learn more about Kubernetes persistent volumes using Azure Files.
193254
<!-- LINKS - external -->
194255
[access-modes]: https://kubernetes.io/docs/concepts/storage/persistent-volumes
195256
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply
196-
[kubectl-describe]: https://kubernetes-v1-4.github.io/docs/user-guide/kubectl/kubectl_describe/
257+
[kubectl-describe]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#describe
258+
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
197259
[kubernetes-files]: https://github.com/kubernetes/examples/blob/master/staging/volumes/azure_file/README.md
198260
[kubernetes-secret]: https://kubernetes.io/docs/concepts/configuration/secret/
199261
[kubernetes-security-context]: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
200262
[kubernetes-storage-classes]: https://kubernetes.io/docs/concepts/storage/storage-classes/#azure-file
201263
[kubernetes-volumes]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/
202264
[pv-static]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#static
265+
[kubernetes-rbac]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/
203266
204267
<!-- LINKS - internal -->
205268
[az-group-create]: /cli/azure/group#az-group-create
206269
[az-group-list]: /cli/azure/group#az-group-list
207-
[az-resource-show]: /cli/azure/resource#az-resource-show
270+
[az-resource-show]: /cli/azure/aks#az-aks-show
208271
[az-storage-account-create]: /cli/azure/storage/account#az-storage-account-create
209272
[az-storage-create]: /cli/azure/storage/account#az-storage-account-create
210273
[az-storage-key-list]: /cli/azure/storage/account/keys#az-storage-account-keys-list

0 commit comments

Comments
 (0)