Skip to content

Commit 2a2bdd4

Browse files
authored
Merge pull request #226604 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 69e0966 + 7de6296 commit 2a2bdd4

17 files changed

+51
-29
lines changed

articles/active-directory-b2c/identity-provider-generic-saml.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ The **OutputClaims** element contains a list of claims returned by the SAML iden
139139

140140
In the example above, *Contoso-SAML2* includes the claims returned by a SAML identity provider:
141141

142-
* The **issuerUserId** claim is mapped to the **assertionSubjectName** claim.
142+
* The **assertionSubjectName** claim is mapped to the **issuerUserId** claim.
143143
* The **first_name** claim is mapped to the **givenName** claim.
144144
* The **last_name** claim is mapped to the **surname** claim.
145-
* The **displayName** claim is mapped to the `http://schemas.microsoft.com/identity/claims/displayname` claim.
145+
* The `http://schemas.microsoft.com/identity/claims/displayname` claim is mapped to the **displayName** claim.
146146
* The **email** claim without name mapping.
147147

148148
The technical profile also returns claims that aren't returned by the identity provider:
@@ -237,4 +237,4 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
237237

238238
- [Configure SAML identity provider options with Azure Active Directory B2C](identity-provider-generic-saml-options.md)
239239

240-
::: zone-end
240+
::: zone-end

articles/active-directory/conditional-access/concept-continuous-access-evaluation.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ When Conditional Access policy or group membership changes need to be applied to
179179
Modern networks often optimize connectivity and network paths for applications differently. This optimization frequently causes variations of the routing and source IP addresses of connections, as seen by your identity provider and resource providers. You may observe this split path or IP address variation in multiple network topologies, including, but not limited to:
180180

181181
- On-premises and cloud-based proxies.
182-
- Virtual private network (VPN) implementations, like split tunneling.
182+
- Virtual private network (VPN) implementations, like [split tunneling](/microsoft-365/enterprise/microsoft-365-vpn-implement-split-tunnel).
183183
- Software defined wide area network (SD-WAN) deployments.
184184
- Load balanced or redundant network egress network topologies, like those using [SNAT](https://wikipedia.org/wiki/Network_address_translation#SNAT).
185185
- Branch office deployments that allow direct internet connectivity for specific applications.
@@ -189,9 +189,10 @@ Modern networks often optimize connectivity and network paths for applications d
189189
In addition to IP variations, customers also may employ network solutions and services that:
190190

191191
- Use IP addresses that may be shared with other customers. For example, cloud-based proxy services where egress IP addresses are shared between customers.
192-
- Use easily varied or undefinable IP addresses. For example, topologies where there are large, dynamic sets of egress IP addresses used, like large enterprise scenarios or split VPN and local egress network traffic.
192+
- Use easily varied or undefinable IP addresses. For example, topologies where there are large, dynamic sets of egress IP addresses used, like large enterprise scenarios or [split VPN](/microsoft-365/enterprise/microsoft-365-vpn-implement-split-tunnel) and local egress network traffic.
193+
194+
Networks where egress IP addresses may change frequently or are shared may affect Azure AD Conditional Access and Continues Access Evaluation (CAE). This variability can affect how these features work and their recommended configurations. Split Tunneling may also cause unexpected blocks when an environment is configured using [Split Tunneling VPN Best Practices](/microsoft-365/enterprise/microsoft-365-vpn-implement-split-tunnel). Routing [Optimized IPs](/microsoft-365/enterprise/microsoft-365-vpn-implement-split-tunnel#optimize-ip-address-ranges) through a Trusted IP/VPN may be required to prevent blocks related to "insufficient_claims" or "Instant IP Enforcement check failed".
193195

194-
Networks where egress IP addresses may change frequently or are shared may affect Azure AD Conditional Access and Continues Access Evaluation (CAE). This variability can affect how these features work, and their recommended configurations.
195196

196197
The following table summarizes Conditional Access and CAE feature behaviors and recommendations for different types of network deployments:
197198

articles/active-directory/develop/active-directory-optional-claims.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Within the SAML tokens, these claims will be emitted with the following URI form
234234

235235
## Configuring groups optional claims
236236

237-
This section covers the configuration options under optional claims for changing the group attributes used in group claims from the default group objectID to attributes synced from on-premises Windows Active Directory. You can configure groups optional claims for your application through the UI or application manifest.
237+
This section covers the configuration options under optional claims for changing the group attributes used in group claims from the default group objectID to attributes synced from on-premises Windows Active Directory. You can configure groups optional claims for your application through the UI or application manifest. Group optional claims are only emitted in the JWT for **user principals**. **Service principals** _will not_ have group optional claims emitted in the JWT.
238238

239239
> [!IMPORTANT]
240240
> Azure AD limits the number of groups emitted in a token to 150 for SAML assertions and 200 for JWT, including nested groups. For more information on group limits and important caveats for group claims from on-premises attributes, see [Configure group claims for applications with Azure AD](../hybrid/how-to-connect-fed-group-claims.md).

articles/aks/api-server-vnet-integration.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,20 @@ az group create -l <location> -n <resource-group>
130130
```azurecli-interactive
131131
# Create the virtual network
132132
az network vnet create -n <vnet-name> \
133+
-g <resource-group> \
133134
-l <location> \
134135
--address-prefixes 172.19.0.0/16
135136
136137
# Create an API server subnet
137-
az network vnet subnet create --vnet-name <vnet-name> \
138+
az network vnet subnet create -g <resource-group> \
139+
--vnet-name <vnet-name> \
138140
--name <apiserver-subnet-name> \
139141
--delegations Microsoft.ContainerService/managedClusters \
140142
--address-prefixes 172.19.0.0/28
141143
142144
# Create a cluster subnet
143-
az network vnet subnet create --vnet-name <vnet-name> \
145+
az network vnet subnet create -g <resource-group> \
146+
--vnet-name <vnet-name> \
144147
--name <cluster-subnet-name> \
145148
--address-prefixes 172.19.1.0/24
146149
```
@@ -149,7 +152,7 @@ az network vnet subnet create --vnet-name <vnet-name> \
149152

150153
```azurecli-interactive
151154
# Create the identity
152-
az identity create -n <managed-identity-name> -l <location>
155+
az identity create -g <resource-group> -n <managed-identity-name> -l <location>
153156
154157
# Assign Network Contributor to the API server subnet
155158
az role assignment create --scope <apiserver-subnet-resource-id> \

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Like Azure CNI Overlay, Kubenet assigns IP addresses to pods from an address spa
4747
| Cluster scale | 1000 nodes and 250 pods/node | 400 nodes and 250 pods/node |
4848
| Network configuration | Simple - no additional configuration required for pod networking | Complex - requires route tables and UDRs on cluster subnet for pod networking |
4949
| Pod connectivity performance | Performance on par with VMs in a VNet | Additional hop adds minor latency |
50-
| Kubernetes Network Policies | Azure Network Policies, Calico | Calico |
50+
| Kubernetes Network Policies | Azure Network Policies, Calico, Cilium | Calico |
5151
| OS platforms supported | Linux and Windows | Linux only |
5252

5353
## IP address planning

articles/aks/configure-azure-cni.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ This article shows you how to use Azure CNI networking to create and use a virtu
2626
* The cluster identity used by the AKS cluster must have at least [Network Contributor](../role-based-access-control/built-in-roles.md#network-contributor) permissions on the subnet within your virtual network. If you wish to define a [custom role](../role-based-access-control/custom-roles.md) instead of using the built-in Network Contributor role, the following permissions are required:
2727
* `Microsoft.Network/virtualNetworks/subnets/join/action`
2828
* `Microsoft.Network/virtualNetworks/subnets/read`
29+
* `Microsoft.Authorization/roleAssignments/write`
2930
* The subnet assigned to the AKS node pool cannot be a [delegated subnet](../virtual-network/subnet-delegation-overview.md).
3031
* AKS doesn't apply Network Security Groups (NSGs) to its subnet and will not modify any of the NSGs associated with that subnet. If you provide your own subnet and add NSGs associated with that subnet, you must ensure the security rules in the NSGs allow traffic within the node CIDR range. For more details, see [Network security groups][aks-network-nsg].
3132

articles/aks/custom-node-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Create a `linuxosconfig.json` file with the following contents:
134134
Create a new cluster specifying the kubelet and OS configurations using the JSON files created in the previous step.
135135

136136
> [!NOTE]
137-
> When you create a cluster, you can specify the kubelet configuration, OS configuration, or both. If you specify a configuration when creating a cluster, only the nodes in the initial node pool will have that configuration applied. Any settings not configured in the JSON file will retain the default value.
137+
> When you create a cluster, you can specify the kubelet configuration, OS configuration, or both. If you specify a configuration when creating a cluster, only the nodes in the initial node pool will have that configuration applied. Any settings not configured in the JSON file will retain the default value. CustomKubeletConfig or CustomLinuxOsConfig isn't supported for OS type: Windows.
138138
139139
```azurecli
140140
az aks create --name myAKSCluster --resource-group myResourceGroup --kubelet-config ./kubeletconfig.json --linux-os-config ./linuxosconfig.json

articles/aks/web-app-routing.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ apiVersion: apps/v1
223223
kind: Deployment
224224
metadata:
225225
name: aks-helloworld
226+
namespace: hello-web-app-routing
226227
spec:
227228
replicas: 1
228229
selector:
@@ -252,6 +253,7 @@ apiVersion: v1
252253
kind: Service
253254
metadata:
254255
name: aks-helloworld
256+
namespace: hello-web-app-routing
255257
spec:
256258
type: ClusterIP
257259
ports:
@@ -524,4 +526,4 @@ When the Web Application Routing add-on is disabled, some Kubernetes resources m
524526
[kubectl-delete]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#delete
525527
[kubectl-logs]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#logs
526528
[ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/
527-
[ingress-resource]: https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource
529+
[ingress-resource]: https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource

articles/batch/batch-automatic-scaling.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,25 @@ You can use these predefined **functions** when defining an autoscale formula.
197197
| Function | Return type | Description |
198198
| --- | --- | --- |
199199
| avg(doubleVecList) |double |Returns the average value for all values in the doubleVecList. |
200+
| ceil(double) |double |Returns the smallest integer value not less than the double. |
201+
| ceil(doubleVecList) |doubleVec |Returns the component-wise `ceil` of the doubleVecList. |
202+
| floor(double) |double |Returns the largest integer value not greater than the double. |
203+
| floor(doubleVecList) |doubleVec |Returns the component-wise `floor` of the doubleVecList. |
200204
| len(doubleVecList) |double |Returns the length of the vector that is created from the doubleVecList. |
201205
| lg(double) |double |Returns the log base 2 of the double. |
202-
| lg(doubleVecList) |doubleVec |Returns the component-wise log base 2 of the doubleVecList. A vec(double) must be explicitly passed for the parameter. Otherwise, the double lg(double) version is assumed. |
206+
| lg(doubleVecList) |doubleVec |Returns the component-wise `lg` of the doubleVecList. |
203207
| ln(double) |double |Returns the natural log of the double. |
204-
| ln(doubleVecList) |doubleVec |Returns the natural log of the double. |
208+
| ln(doubleVecList) |doubleVec |Returns the component-wise `ln` of the doubleVecList. |
205209
| log(double) |double |Returns the log base 10 of the double. |
206-
| log(doubleVecList) |doubleVec |Returns the component-wise log base 10 of the doubleVecList. A vec(double) must be explicitly passed for the single double parameter. Otherwise, the double log(double) version is assumed. |
210+
| log(doubleVecList) |doubleVec |Returns the component-wise `log` of the doubleVecList. |
207211
| max(doubleVecList) |double |Returns the maximum value in the doubleVecList. |
208212
| min(doubleVecList) |double |Returns the minimum value in the doubleVecList. |
209213
| norm(doubleVecList) |double |Returns the two-norm of the vector that is created from the doubleVecList. |
210214
| percentile(doubleVec v, double p) |double |Returns the percentile element of the vector v. |
211215
| rand() |double |Returns a random value between 0.0 and 1.0. |
212216
| range(doubleVecList) |double |Returns the difference between the min and max values in the doubleVecList. |
217+
| round(double) |double |Returns the nearest integer value to the double (in floating-point format), rounding halfway cases away from zero. |
218+
| round(doubleVecList) |doubleVec |Returns the component-wise `round` of the doubleVecList. |
213219
| std(doubleVecList) |double |Returns the sample standard deviation of the values in the doubleVecList. |
214220
| stop() | |Stops evaluation of the autoscaling expression. |
215221
| sum(doubleVecList) |double |Returns the sum of all the components of the doubleVecList. |

articles/cosmos-db/role-based-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ Update-AzCosmosDBAccount -ResourceGroupName [ResourceGroupName] -Name [CosmosDBA
118118
- [What is Azure role-based access control (Azure RBAC)](../role-based-access-control/overview.md)
119119
- [Azure custom roles](../role-based-access-control/custom-roles.md)
120120
- [Azure Cosmos DB resource provider operations](../role-based-access-control/resource-provider-operations.md#microsoftdocumentdb)
121-
- [Configure role-based access control for your Azure Cosmso DB for MongoDB](mongodb/how-to-setup-rbac.md)
121+
- [Configure role-based access control for your Azure Cosmos DB for MongoDB](mongodb/how-to-setup-rbac.md)

0 commit comments

Comments
 (0)