Skip to content

Commit 6ac0cc2

Browse files
authored
Merge pull request #214611 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 57abd7a + 51552ae commit 6ac0cc2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

articles/aks/concepts-identity.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ The following permissions are needed by the identity creating and operating the
182182
> | `Microsoft.Network/virtualNetworks/subnets/join/action` | Required to configure the Network Security Group for the subnet when using a custom VNET.|
183183
> | `Microsoft.Network/publicIPAddresses/join/action` <br/> `Microsoft.Network/publicIPPrefixes/join/action` | Required to configure the outbound public IPs on the Standard Load Balancer. |
184184
> | `Microsoft.OperationalInsights/workspaces/sharedkeys/read` <br/> `Microsoft.OperationalInsights/workspaces/read` <br/> `Microsoft.OperationsManagement/solutions/write` <br/> `Microsoft.OperationsManagement/solutions/read` <br/> `Microsoft.ManagedIdentity/userAssignedIdentities/assign/action` | Required to create and update Log Analytics workspaces and Azure monitoring for containers. |
185+
> | `Microsoft.Network/virtualNetworks/joinLoadBalancer/action` | Required to configure the IP-based Load Balancer Backend Pools. |
185186
186187
### AKS cluster identity permissions
187188

articles/azure-fluid-relay/quickstarts/quickstart-dice-roll.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ You can open new tabs with the same URL to create additional instances of the di
5151
To run against the Azure Fluid Relay service, you'll need to update your app's configuration to connect to your Azure service instead of your local server.
5252

5353
### Configure and create an Azure client
54-
54+
Install @fluidframework/azure-client and "@fluidframework/test-client-utils packages and import Azure Client and InsecureTokenProvider.
55+
```javascript
56+
import { InsecureTokenProvider } from "@fluidframework/test-client-utils";
57+
import { AzureClient } from "@fluidframework/azure-client";
58+
```
5559
To configure the Azure client, replace the local connection `serviceConfig` object in `app.js` with your Azure Fluid Relay
5660
service configuration values. These values can be found in the "Access Key" section of the Fluid Relay resource in the Azure portal. Your `serviceConfig` object should look like this with the values replaced
5761

articles/cognitive-services/containers/disconnected-container-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sections:
4040
We'd like to make more Cognitive Services offerings available as containers. Contact your local Microsoft account manager to get updates on new container releases and other Cognitive Services announcements.
4141
- question: How do I get access to disconnected container?
4242
answer: |
43-
Fill out and submit the request form to request access to the container. Access is limited to customers that meet the following requirements:
43+
Fill out and submit the [request form](https://aka.ms/csdisconnectedcontainers) to request access to the container. Access is limited to customers that meet the following requirements:
4444
4545
* Your organization must have an enterprise agreement or an equivalent agreement and should be identified as strategic customer or partner with Microsoft.
4646
* Valid business scenario/use case - Disconnected containers are expected to run fully offline hence, your use cases must meet one of below or similar requirements:

0 commit comments

Comments
 (0)