Skip to content

Commit e3cfd8a

Browse files
authored
Merge pull request #288159 from MicrosoftDocs/main
10/10 11:00 AM IST Publish
2 parents 5694b0b + e03aea6 commit e3cfd8a

File tree

12 files changed

+120
-109
lines changed

12 files changed

+120
-109
lines changed

articles/azure-cache-for-redis/cache-tutorial-aks-get-started.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 10/01/2024
99

1010
# Tutorial: Connect to Azure Cache for Redis from your application hosted on Azure Kubernetes Service
1111

12-
In this tutorial, you adapt the [AKS sample voting application](https://github.com/Azure-Samples/azure-voting-app-redis/tree/master) to use with an Azure Cache for Redis instance instead. The original sample uses a Redis cache deployed as a container to your AKS cluster. Following some simple steps, you can configure the AKS sample voting application to connect to your Azure Cache for Redis instance.
12+
In this tutorial, you use this [sample](https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/tutorial/connect-from-aks) to connect with an Azure Cache for Redis instance.
1313

1414
## Prerequisites
1515

@@ -37,16 +37,18 @@ In this tutorial, you adapt the [AKS sample voting application](https://github.c
3737

3838
## Run sample locally
3939

40-
To run this sample locally, configure your user principal as a Redis User on your Redis instance. The code sample will use your user principal through (DefaultAzureCredential)[https://learn.microsoft.com/en-us/dotnet/azure/sdk/authentication/?tabs=command-line#use-defaultazurecredential-in-an-application] to connect to Redis instance.
40+
To run this sample locally, configure your user principal as a Redis User on your Redis instance. The code sample uses your user principal through [DefaultAzureCredential](/dotnet/azure/sdk/authentication/?tabs=command-line#use-defaultazurecredential-in-an-application) to connect to Redis instance.
4141

4242
## Configure your AKS cluster
4343

44-
Follow these [steps](/azure/aks/workload-identity-deploy-cluster) to configure a workload identity for your AKS cluster. Complete the following steps:
44+
Follow these [steps](/azure/aks/workload-identity-deploy-cluster) to configure a workload identity for your AKS cluster.
4545

46-
- Enable OIDC issuer and workload identity
47-
- Skip the step to create user assigned managed identity if you already created your managed identity. If you create a new managed identity, ensure that you create a new Redis User for your managed identity and assign appropriate data access permissions.
48-
- Create a Kubernetes Service account annotated with the client ID of your user assigned managed identity
49-
- Create a federated identity credential for your AKS cluster.
46+
Then, complete the following steps:
47+
48+
- Enable OIDC issuer and workload identity
49+
- Skip the step to create user assigned managed identity if you already created your managed identity. If you create a new managed identity, ensure that you create a new Redis User for your managed identity and assign appropriate data access permissions.
50+
- Create a Kubernetes Service account annotated with the client ID of your user assigned managed identity
51+
- Create a federated identity credential for your AKS cluster.
5052

5153
## Configure your workload that connects to Azure Cache for Redis
5254

@@ -194,4 +196,4 @@ kubectl delete pod entrademo-pod
194196

195197
- [Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Azure portal](/azure/aks/learn/quick-kubernetes-deploy-portal)
196198
- [Quickstart: Deploy and configure workload identity on an Azure Kubernetes Service (AKS) cluster](/azure/aks/workload-identity-deploy-cluster)
197-
- [Azure Cache for Redis Entra ID Authentication](/azure/azure-cache-for-redis/cache-azure-active-directory-for-authentication)
199+
- [Azure Cache for Redis Microsoft Entra ID Authentication](/azure/azure-cache-for-redis/cache-azure-active-directory-for-authentication)

articles/connectors/connectors-native-reqres.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,20 @@ The **Request** trigger creates a manually callable endpoint that handles *only*
357357
> change your storage account and copy your workflow to the new storage account, the URL for
358358
> the **Request** trigger also changes to reflect the new storage account. The same workflow has a different URL.
359359

360+
361+
### Schema validation for stateless workflows
362+
363+
To enable schema validation for stateless workflows, make sure that the **host.json** file in the logic app resource or project has the following [host setting](../logic-apps/edit-app-settings-host-settings.md#manage-host-settings---hostjson):
364+
365+
```json
366+
"extensions": {
367+
"workflow": {
368+
"Settings": {
369+
"Runtime.StatelessFlowEvaluateTriggerCondition": "true"
370+
}
371+
}
372+
}
373+
```
360374
---
361375

362376
Now, continue building your workflow by adding another action as the next step. For example, you can respond to the request by [adding a Response action](#add-response), which you can use to return a customized response and is described later in this article.

articles/event-grid/end-point-validation-event-grid-events-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ description: This article describes WebHook event delivery and endpoint validati
44
ms.topic: concept-article
55
ms.date: 09/25/2024
66
ms.custom: FY25Q1-Linter
7-
#customer intent: As a developer, I want to know hw to validate a Webhook endpoint using the Event Grid event schema.
7+
#customer intent: As a developer, I want to know how to validate a Webhook endpoint using the Event Grid event schema.
88
---
99

1010

11-
# # Endpoint validation with Event Grid event schema
11+
# Endpoint validation with Event Grid event schema
1212
Webhooks are one of the many ways to receive events from Azure Event Grid. When a new event is ready, Event Grid service POSTs an HTTP request to the configured endpoint with the event information in the request body.
1313

1414
Like many other services that support webhooks, Event Grid requires you to prove ownership of your Webhook endpoint before it starts delivering events to that endpoint. This requirement prevents a malicious user from flooding your endpoint with events.

articles/event-grid/handler-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ You can use the [`az eventgrid event-subscription create`](/cli/azure/eventgrid/
7676
You can use the [New-AzEventGridSubscription](/powershell/module/az.eventgrid/new-azeventgridsubscription) or [Update-AzEventGridSubscription](/powershell/module/az.eventgrid/update-azeventgridsubscription) cmdlet to configure batch-related settings using the following parameters: `-MaxEventsPerBatch` or `-PreferredBatchSizeInKiloBytes`.
7777

7878
> [!NOTE]
79-
> When you use Event Grid Trigger, the Event Grid service fetches the client secret for the target Azure function, and uses it to deliver events to the Azure function. If you protect your azure function with a Microsoft Entra application, you have to take the generic web hook approach and use the HTTP Trigger.
79+
> When you use Event Grid Trigger, the Event Grid service fetches the client secret for the target Azure function, and uses it to deliver events to the Azure function. If you protect your Azure function with a Microsoft Entra application, you have to take the generic web hook approach and use the HTTP Trigger.
8080
8181
## Next steps
8282
See the [Event handlers](event-handlers.md) article for a list of supported event handlers.

articles/expressroute/monitor-expressroute-reference.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ Dimension for Express Direct:
397397

398398
[!INCLUDE [horz-monitor-ref-logs-tables](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-logs-tables.md)]
399399

400+
> [!NOTE]
401+
> Logs in Azure Log Analytics may take up to 24 hours to appear.
402+
400403
### ExpressRoute Microsoft.Network/expressRouteCircuits
401404

402405
- [AzureActivity](/azure/azure-monitor/reference/tables/AzureActivity#columns)

articles/iot-operations/connect-to-cloud/howto-configure-kafka-endpoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To configure a dataflow endpoint for a Kafka endpoint, we suggest using the mana
4646
| Setting | Description |
4747
| -------------------- | ------------------------------------------------------------------------------------------------- |
4848
| Name | The name of the dataflow endpoint. |
49-
| Host | The hostname of the Kafka broker in the format `<HOST>.servicebus.windows.net`. |
49+
| Host | The hostname of the Kafka broker in the format `<HOST>.servicebus.windows.net:9093`. Include port number `9093` in the host setting for Event Hubs. |
5050
| Authentication method| The method used for authentication. Choose *System assigned managed identity*, *User assigned managed identity*, or *SASL*. |
5151
| SASL type | The type of SASL authentication. Choose *Plain*, *ScramSha256*, or *ScramSha512*. Required if using *SASL*. |
5252
| Synced secret name | The name of the secret. Required if using *SASL* or *X509*. |
@@ -126,7 +126,7 @@ To configure a dataflow endpoint for non-Event-Hub Kafka brokers, set the host,
126126
| Setting | Description |
127127
| -------------------- | ------------------------------------------------------------------------------------------------- |
128128
| Name | The name of the dataflow endpoint. |
129-
| Host | The hostname of the Kafka broker in the format `<HOST>.servicebus.windows.net`. |
129+
| Host | The hostname of the Kafka broker in the format `<Kafa-broker-host>:xxxx`. Include port number in the host setting. |
130130
| Authentication method| The method used for authentication. Choose *System assigned managed identity*, *User assigned managed identity*, *SASL*, or *X509 certificate*. |
131131
| SASL type | The type of SASL authentication. Choose *Plain*, *ScramSha256*, or *ScramSha512*. Required if using *SASL*. |
132132
| Synced secret name | The name of the secret. Required if using *SASL* or *X509*. |

articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The [AksEdgeQuickStartForAio.ps1](https://github.com/Azure/AKS-Edge/blob/main/to
8484

8585
1. Open an elevated PowerShell window and change the directory to a working folder.
8686

87-
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant.
87+
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant. Run the following command exactly as written, without changing the GUID value.
8888

8989
```azurecli
9090
az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv
@@ -225,7 +225,86 @@ To connect your cluster to Azure Arc:
225225
export CLUSTER_NAME=<NEW_CLUSTER_NAME>
226226
```
227227
228-
[!INCLUDE [connect-cluster-k3s](../includes/connect-cluster-k3s.md)]
228+
1. After signing in, Azure CLI displays all of your subscriptions and indicates your default subscription with an asterisk `*`. To continue with your default subscription, select `Enter`. Otherwise, type the number of the Azure subscription that you want to use.
229+
230+
1. Register the required resource providers in your subscription:
231+
232+
>[!NOTE]
233+
>This step only needs to be run once per subscription. To register resource providers, you need permission to do the `/register/action` operation, which is included in subscription Contributor and Owner roles. For more information, see [Azure resource providers and types](../../azure-resource-manager/management/resource-providers-and-types.md).
234+
235+
```azurecli
236+
az provider register -n "Microsoft.ExtendedLocation"
237+
az provider register -n "Microsoft.Kubernetes"
238+
az provider register -n "Microsoft.KubernetesConfiguration"
239+
az provider register -n "Microsoft.IoTOperations"
240+
az provider register -n "Microsoft.DeviceRegistry"
241+
az provider register -n "Microsoft.SecretSyncController"
242+
```
243+
244+
1. Use the [az group create](/cli/azure/group#az-group-create) command to create a resource group in your Azure subscription to store all the resources:
245+
246+
```azurecli
247+
az group create --location $LOCATION --resource-group $RESOURCE_GROUP --subscription $SUBSCRIPTION_ID
248+
```
249+
1. Remove the existing connected k8s cli if any
250+
```azurecli
251+
az extension remove --name connectedk8s
252+
```
253+
254+
1. Download and install a preview version of the `connectedk8s` extension for Azure CLI.
255+
256+
```azurecli
257+
curl -L -o connectedk8s-1.10.0-py2.py3-none-any.whl https://github.com/AzureArcForKubernetes/azure-cli-extensions/raw/refs/heads/connectedk8s/public/cli-extensions/connectedk8s-1.10.0-py2.py3-none-any.whl
258+
az extension add --upgrade --source connectedk8s-1.10.0-py2.py3-none-any.whl
259+
```
260+
261+
1. Use the [az connectedk8s connect](/cli/azure/connectedk8s#az-connectedk8s-connect) command to Arc-enable your Kubernetes cluster and manage it as part of your Azure resource group:
262+
263+
```azurecli
264+
az connectedk8s connect --name $CLUSTER_NAME -l $LOCATION --resource-group $RESOURCE_GROUP --subscription $SUBSCRIPTION_ID --enable-oidc-issuer --enable-workload-identity
265+
```
266+
267+
1. Get the cluster's issuer URL.
268+
269+
```azurecli
270+
az connectedk8s show --resource-group $RESOURCE_GROUP --name $CLUSTER_NAME --query oidcIssuerProfile.issuerUrl --output tsv
271+
```
272+
273+
Save the output of this command to use in the next steps.
274+
275+
1. Create a k3s config file.
276+
277+
```bash
278+
sudo nano /etc/rancher/k3s/config.yaml
279+
```
280+
281+
1. Add the following content to the `config.yaml` file, replacing the `<SERVICE_ACCOUNT_ISSUER>` placeholder with your cluster's issuer URL.
282+
283+
```yml
284+
kube-apiserver-arg:
285+
- service-account-issuer=<SERVICE_ACCOUNT_ISSUER>
286+
- service-account-max-token-expiration=24h
287+
```
288+
289+
1. Save the file and exit the nano editor.
290+
291+
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant and save it as an environment variable. Run the following command exactly as written, without changing the GUID value.
292+
293+
```azurecli
294+
export OBJECT_ID=$(az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv)
295+
```
296+
297+
1. Use the [az connectedk8s enable-features](/cli/azure/connectedk8s#az-connectedk8s-enable-features) command to enable custom location support on your cluster. This command uses the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses. Run this command on the machine where you deployed the Kubernetes cluster:
298+
299+
```azurecli
300+
az connectedk8s enable-features -n $CLUSTER_NAME -g $RESOURCE_GROUP --custom-locations-oid $OBJECT_ID --features cluster-connect custom-locations
301+
```
302+
303+
1. Restart K3s.
304+
305+
```bash
306+
systemctl restart k3s
307+
```
229308
230309
---
231310

articles/iot-operations/get-started-end-to-end-sample/quickstart-deploy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ To connect your cluster to Azure Arc:
8888
az provider register -n "Microsoft.KubernetesConfiguration"
8989
az provider register -n "Microsoft.IoTOperations"
9090
az provider register -n "Microsoft.DeviceRegistry"
91+
az provider register -n "Microsoft.SecretSyncController"
9192
```
9293

9394
1. Use the [az group create](/cli/azure/group#az-group-create) command to create a resource group in your Azure subscription to store all the resources:
@@ -105,7 +106,7 @@ To connect your cluster to Azure Arc:
105106
>[!TIP]
106107
>The value of `$CLUSTER_NAME` is automatically set to the name of your codespace. Replace the environment variable if you want to use a different name.
107108
108-
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service in your tenant uses and save it as an environment variable.
109+
1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service in your tenant uses and save it as an environment variable. Run the following command exactly as written, without changing the GUID value.
109110

110111
```azurecli
111112
export OBJECT_ID=$(az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv)

articles/iot-operations/includes/connect-cluster-k3s.md

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)