Skip to content

Commit 245400e

Browse files
authored
Merge pull request #303960 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 9d8249d + f052d62 commit 245400e

File tree

6 files changed

+28
-7
lines changed

6 files changed

+28
-7
lines changed

articles/application-gateway/for-containers/how-to-end-to-end-tls-ingress-api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ metadata:
5454
annotations:
5555
alb.networking.azure.io/alb-name: alb-test
5656
alb.networking.azure.io/alb-namespace: alb-test-infra
57+
alb.networking.azure.io/alb-ingress-extension: https-ingress
5758
spec:
5859
ingressClassName: azure-alb-external
5960
tls:
@@ -100,6 +101,7 @@ metadata:
100101
annotations:
101102
alb.networking.azure.io/alb-id: $RESOURCE_ID
102103
alb.networking.azure.io/alb-frontend: $FRONTEND_NAME
104+
alb.networking.azure.io/alb-ingress-extension: https-ingress
103105
spec:
104106
ingressClassName: azure-alb-external
105107
tls:
@@ -137,6 +139,7 @@ metadata:
137139
annotations:
138140
alb.networking.azure.io/alb-frontend: FRONTEND_NAME
139141
alb.networking.azure.io/alb-id: /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/yyyyyyyy/providers/Microsoft.ServiceNetworking/trafficControllers/zzzzzz
142+
alb.networking.azure.io/alb-ingress-extension: https-ingress
140143
kubectl.kubernetes.io/last-applied-configuration: |
141144
{"apiVersion":"networking.k8s.io/v1","kind":"Ingress","metadata":{"annotations":{"alb.networking.azure.io/alb-frontend":"FRONTEND_NAME","alb.networking.azure.io/alb-id":"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/yyyyyyyy/providers/Microsoft.ServiceNetworking/trafficControllers/zzzzzz"},"name"
142145
:"ingress-01","namespace":"test-infra"},"spec":{"ingressClassName":"azure-alb-external","rules":[{"host":"contoso.com","http":{"paths":[{"backend":{"service":{"name":"https-app","port":{"number":443}}},"path":"/","pathType":"Prefix"}]}}],"tls":[{"hosts":["contoso.com"],"secretName":"contoso.com"}]}}

articles/application-gateway/tutorial-ingress-controller-add-on-existing.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ To configure more parameters for the above command, see [az aks create](/cli/azu
5555
> [!NOTE]
5656
> A node resource group will be created with the name **MC_resource-group-name_cluster-name_location**.
5757
58-
>[!NOTE]
59-
>If you are planning on using AGIC with an AKS cluster using CNI Overlay, specify the parameter `--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview` to configure AGIC to handle connectivity to the CNI Overlay enabled cluster.
60-
6158
>[!WARNING]
6259
>This document assumes Azure CNI is installed in the AKS cluster. If you are planning on using CNI Overlay, you must ensure Application Gateway and the AKS cluster are part of the same virtual network.
6360

articles/automation/disable-local-authentication.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,24 @@ In the Azure portal, you may receive a warning message on the landing page for t
2727
Disabling local authentication doesn't take effect immediately. Allow a few minutes for the service to block future authentication requests.
2828

2929
>[!NOTE]
30-
> - Currently, PowerShell support for the new API version (2021-06-22) or the flag – `DisableLocalAuth` is not available. However, you can use the Rest-API with this API version to update the flag.
30+
> - Currently, PowerShell support for the new API version (2021-06-22) or the flag – `DisableLocalAuth` is not available. However, you can use the REST API with this API version to update the flag. Here is how to do it with the [`Invoke-AzRestMethod`](/powershell/azure/manage-azure-resources-invoke-azrestmethod) cmdlet.
31+
>
32+
> ```azurepowershell-interactive
33+
> $SubscriptionId = "your-subscription-id"
34+
> $ResourceGroupName = "your-resource-group-name"
35+
> $AutomationAccountName = "your-automation-account-name"
36+
> $RequestUri = "https://management.azure.com/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Automation/automationAccounts/$($AutomationAccountName)?api-version=2023-11-01"
37+
> $Payload = @{
38+
> properties = @{
39+
> disableLocalAuth = $true
40+
> }
41+
> } | ConvertTo-Json
42+
> Invoke-AzRest -Method Patch -Uri $RequestUri -Payload $Payload
43+
>
44+
> # Verify
45+
> $AutomationAccount = (Invoke-AzRest -Method Get -Uri $RequestUri).Content | ConvertFrom-Json
46+
> "disableLocalAuth = $($AutomationAccount.properties.disableLocalAuth)"
47+
> ```
3148
3249
## Re-enable local authentication
3350

articles/communication-services/quickstarts/email/send-email-advanced/includes/attachments-js.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We can add an attachment by defining an attachment object and adding it to our m
1818
const filePath = "<path-to-your-file>";
1919

2020
const message = {
21-
sender: "<[email protected]>",
21+
senderAddress: "<[email protected]>",
2222
content: {
2323
subject: "Welcome to Azure Communication Service Email.",
2424
plainText: "<This email message is sent from Azure Communication Service Email using JavaScript SDK.>"

articles/communication-services/quickstarts/email/send-email-advanced/includes/attachments-net.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ var emailContent = new EmailContent("Welcome to Azure Communication Service Emai
2525

2626
// Create the EmailMessage
2727
var emailMessage = new EmailMessage(
28-
senderAddress: "[email protected]" // The email address of the domain registered with the Communication Services resource
29-
recipientAddress: "[email protected]"
28+
senderAddress: "[email protected]", // The email address of the domain registered with the Communication Services resource
29+
recipientAddress: "[email protected]",
3030
content: emailContent);
3131

3232
// Create the EmailAttachment

articles/storage/blobs/storage-blob-static-website.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Azure Blob Storage is ideal for storing large amounts of unstructured data such
1818

1919
If you need a web server to render content, you can use [Azure App Service](https://azure.microsoft.com/services/app-service/).
2020

21+
## Prerequisites
22+
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/).
23+
- An Azure storage account resource. To learn how to create a storage account, see [Create an Azure storage account](/common/storage-account-create.md).
24+
2125
## Setting up a static website
2226

2327
Static website hosting functionality is configured within a storage account and isn't enabled by default. To enable static website hosting, select a storage account. In the left navigation pane, select **Static website** from the **Data management** group, and then select **Enabled**. Provide a name for your *Index document name*. You can optionally provide a path to a custom 404 page. Finally, select **Save** to save your configuration changes.

0 commit comments

Comments
 (0)