Skip to content

Commit 3d532a8

Browse files
Merge branch 'MicrosoftDocs:main' into warning
2 parents c489e8a + d68f91b commit 3d532a8

File tree

12 files changed

+263
-254
lines changed

12 files changed

+263
-254
lines changed

articles/ai-services/openai/concepts/models.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,18 @@ The following Embeddings models are available with [Azure Government](/azure/azu
254254

255255
### Assistants (Preview)
256256

257-
For Assistants you need a combination of a supported model and a supported region. Certain tools and capabilities require the latest models. For example, [parallel function calling](../how-to/assistant-functions.md) requires the latest 1106 models.
257+
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio..
258258

259259
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` |
260260
|-----|---|---|---|---|---|
261261
| Australia East ||||| |
262-
| East US 2 || ||| |
263-
| Sweden Central ||||| |
262+
| East US || | | ||
263+
| East US 2 || ||| |
264+
| France Central ||||| |
265+
| Norway East | | | || |
266+
| Sweden Central ||||| |
267+
| UK South ||||| |
268+
264269

265270
For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md).
266271

articles/application-gateway/for-containers/application-gateway-for-containers-components.md

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ author: greglin
66
ms.service: application-gateway
77
ms.subservice: appgw-for-containers
88
ms.topic: conceptual
9-
ms.date: 02/27/2024
9+
ms.date: 03/26/2024
1010
ms.author: greglin
1111
---
1212

1313
# Application Gateway for Containers components
1414

15-
This article provides detailed descriptions and requirements for components of Application Gateway for Containers. Information about how Application Gateway for Containers accepts incoming requests and routes them to a backend target is provided. For a general overview of Application Gateway for Containers, see [What is Application Gateway for Containers](overview.md).
15+
This article provides detailed descriptions and requirements for components of Application Gateway for Containers. Information about how Application Gateway for Containers accepts incoming requests and routes them to a backend target is provided. For a general overview of Application Gateway for Containers, see [What is Application Gateway for Containers](overview.md).
1616

1717
### Core components
1818

@@ -25,55 +25,55 @@ This article provides detailed descriptions and requirements for components of A
2525

2626
- An Application Gateway for Containers frontend resource is an Azure child resource of the Application Gateway for Containers parent resource.
2727
- An Application Gateway for Containers frontend defines the entry point client traffic should be received by a given Application Gateway for Containers.
28-
- A frontend can't be associated to multiple Application Gateway for Containers
29-
- Each frontend provides a unique FQDN that can be referenced by a customer's CNAME record
30-
- Private IP addresses are currently unsupported
31-
- A single Application Gateway for Containers can support multiple frontends
28+
- A frontend can't be associated to multiple Application Gateway for Containers.
29+
- Each frontend provides a unique FQDN that can be referenced by a customer's CNAME record.
30+
- Private IP addresses are currently unsupported.
31+
- A single Application Gateway for Containers can support multiple frontends.
3232

3333
### Application Gateway for Containers associations
3434

3535
- An Application Gateway for Containers association resource is an Azure child resource of the Application Gateway for Containers parent resource.
36-
- An Application Gateway for Containers association defines a connection point into a virtual network. An association is a 1:1 mapping of an association resource to an Azure Subnet that has been delegated.
37-
- Application Gateway for Containers is designed to allow for multiple associations
38-
- At this time, the current number of associations is currently limited to 1
39-
- During creation of an association, the underlying data plane is provisioned and connected to a subnet within the defined virtual network's subnet
36+
- An Application Gateway for Containers association defines a connection point into a virtual network. An association is a 1:1 mapping of an association resource to an Azure Subnet that has been delegated.
37+
- Application Gateway for Containers is designed to allow for multiple associations.
38+
- At this time, the current number of associations is currently limited to 1.
39+
- During creation of an association, the underlying data plane is provisioned and connected to a subnet within the defined virtual network's subnet.
4040
- Each association should assume at least 256 addresses are available in the subnet at time of provisioning.
4141
- A minimum /24 subnet mask for each deployment (assuming no resources have previously been provisioned in the subnet).
4242
- If n number of Application Gateway for Containers are provisioned, with the assumption each Application Gateway for Containers contains one association, and the intent is to share the same subnet, the available required addresses should be n*256.
43-
- All Application Gateway for Containers association resources should match the same region as the Application Gateway for Containers parent resource
43+
- All Application Gateway for Containers association resources should match the same region as the Application Gateway for Containers parent resource.
4444

4545
### Application Gateway for Containers ALB Controller
4646

47-
- An Application Gateway for Containers ALB Controller is a Kubernetes deployment that orchestrates configuration and deployment of Application Gateway for Containers by watching Kubernetes both Custom Resources and Resource configurations, such as, but not limited to, Ingress, Gateway, and ApplicationLoadBalancer. It uses both ARM / Application Gateway for Containers configuration APIs to propagate configuration to the Application Gateway for Containers Azure deployment.
48-
- ALB Controller is deployed / installed via Helm
49-
- ALB Controller consists of two running pods
50-
- alb-controller pod is responsible for orchestrating customer intent to Application Gateway for Containers load balancing configuration
51-
- alb-controller-bootstrap pod is responsible for management of CRDs
47+
- An Application Gateway for Containers ALB Controller is a Kubernetes deployment that orchestrates configuration and deployment of Application Gateway for Containers by watching Kubernetes both Custom Resources and Resource configurations, such as, but not limited to, Ingress, Gateway, and ApplicationLoadBalancer. It uses both ARM / Application Gateway for Containers configuration APIs to propagate configuration to the Application Gateway for Containers Azure deployment.
48+
- ALB Controller is deployed / installed via Helm.
49+
- ALB Controller consists of two running pods.
50+
- alb-controller pod is responsible for orchestrating customer intent to Application Gateway for Containers load balancing configuration.
51+
- alb-controller-bootstrap pod is responsible for management of CRDs.
5252

5353
## Azure / general concepts
5454

5555
### Private IP address
5656

57-
- A private IP address isn't explicitly defined as an Azure Resource Manager resource. A private IP address would refer to a specific host address within a given virtual network's subnet.
57+
- A private IP address isn't explicitly defined as an Azure Resource Manager resource. A private IP address would refer to a specific host address within a given virtual network's subnet.
5858

5959
### Subnet delegation
6060

6161
- Microsoft.ServiceNetworking/trafficControllers is the namespace adopted by Application Gateway for Containers and may be delegated to a virtual network's subnet.
6262
- When delegation occurs, provisioning of Application Gateway for Containers resources doesn't happen, nor is there an exclusive mapping to an Application Gateway for Containers association resource.
63-
- Any number of subnets can have a subnet delegation that is the same or different to Application Gateway for Containers. Once defined, no other resources, other than the defined service, can be provisioned into the subnet unless explicitly defined by the service's implementation.
63+
- Any number of subnets can have a subnet delegation that is the same or different to Application Gateway for Containers. Once defined, no other resources, other than the defined service, can be provisioned into the subnet unless explicitly defined by the service's implementation.
6464

6565
### User-assigned managed identity
6666

6767
- Managed identities for Azure resources eliminate the need to manage credentials in code.
68-
- A User Managed Identity is required for each Azure Load Balancer Controller to make changes to Application Gateway for Containers
68+
- A User Managed Identity is required for each Azure Load Balancer Controller to make changes to Application Gateway for Containers.
6969
- _AppGw for Containers Configuration Manager_ is a built-in RBAC role that allows ALB Controller to access and configure the Application Gateway for Containers resource.
7070

7171
> [!Note]
7272
> The _AppGw for Containers Configuration Manager_ role has [data action permissions](../../role-based-access-control/role-definitions.md#control-and-data-actions) that the Owner and Contributor roles do not have. It is critical proper permissions are delegated to prevent issues with ALB Controller making changes to the Application Gateway for Containers service.
7373
7474
## How Application Gateway for Containers accepts a request
7575

76-
Each Application Gateway for Containers frontend provides a generated Fully Qualified Domain Name managed by Azure. The FQDN may be used as-is or customers may opt to mask the FQDN with a CNAME record.
76+
Each Application Gateway for Containers frontend provides a generated Fully Qualified Domain Name managed by Azure. The FQDN may be used as-is or customers may opt to mask the FQDN with a CNAME record.
7777

7878
Before a client sends a request to Application Gateway for Containers, the client resolves a CNAME that points to the frontend's FQDN; or the client may directly resolve the FQDN provided by Application Gateway for Containers by using a DNS server.
7979

@@ -85,6 +85,10 @@ A set of routing rules evaluates how the request for that hostname should be ini
8585

8686
## How Application Gateway for Containers routes a request
8787

88+
### HTTP/2 Requests
89+
90+
Application Gateway for Containers fully supports HTTP/2 protocol for communication from the client to the frontend. Communication from Application Gateway for Containers to the backend target uses the HTTP/1.1 protocol. The HTTP/2 setting is always enabled and can't be changed. If clients prefer to use HTTP/1.1 for their communication to the frontend of Application Gateway for Containers, they may continue to negotiate accordingly.
91+
8892
### Modifications to the request
8993

9094
Application Gateway for Containers inserts three extra headers to all requests before requests are initiated from Application Gateway for Containers to a backend target:
@@ -93,9 +97,9 @@ Application Gateway for Containers inserts three extra headers to all requests b
9397
- x-forwarded-proto
9498
- x-request-id
9599

96-
**x-forwarded-for** is the original requestor's client IP address. If the request is coming through a proxy, the header value appends the address received, comma delimited. In example: 1.2.3.4,5.6.7.8; where 1.2.3.4 is the client IP address to the proxy in front of Application Gateway for Containers, and 5.6.7.8 is the address of the proxy forwarding traffic to Application Gateway for Containers.
100+
**x-forwarded-for** is the original requestor's client IP address. If the request is coming through a proxy, the header value appends the address received, comma delimited. In example: 1.2.3.4,5.6.7.8; where 1.2.3.4 is the client IP address to the proxy in front of Application Gateway for Containers, and 5.6.7.8 is the address of the proxy forwarding traffic to Application Gateway for Containers.
97101

98-
**x-forwarded-proto** returns the protocol received by Application Gateway for Containers from the client. The value is either http or https.
102+
**x-forwarded-proto** returns the protocol received by Application Gateway for Containers from the client. The value is either http or https.
99103

100104
**x-request-id** is a unique guid generated by Application Gateway for Containers for each client request and presented in the forwarded request to the backend target. The guid consists of 32 alphanumeric characters, separated by dashes (for example: d23387ab-e629-458a-9c93-6108d374bc75). This guid can be used to correlate a request received by Application Gateway for Containers and initiated to a backend target as defined in access logs.
101105

articles/application-gateway/for-containers/overview.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.custom: references_regions
77
ms.service: application-gateway
88
ms.subservice: appgw-for-containers
99
ms.topic: overview
10-
ms.date: 03/07/2024
10+
ms.date: 03/26/2024
1111
ms.author: greglin
1212
---
1313

@@ -58,6 +58,7 @@ Application Gateway for Containers supports the following features for traffic m
5858
- Availability zone resiliency
5959
- Default and custom health probes
6060
- Header rewrite
61+
- HTTP/2
6162
- HTTPS traffic management:
6263
- SSL termination
6364
- End to End SSL
@@ -79,7 +80,7 @@ Application Gateway for Containers supports the following features for traffic m
7980

8081
There are two deployment strategies for management of Application Gateway for Containers:
8182

82-
- **Bring your own (BYO) deployment:** In this deployment strategy, deployment and lifecycle of the Application Gateway for Containers resource, Association and Frontend resource is assumed via Azure portal, CLI, PowerShell, Terraform, etc. and referenced in configuration within Kubernetes.
83+
- **Bring your own (BYO) deployment:** In this deployment strategy, deployment and lifecycle of the Application Gateway for Containers resource, Association, and Frontend resource is assumed via Azure portal, CLI, PowerShell, Terraform, etc. and referenced in configuration within Kubernetes.
8384
- **In Gateway API:** Every time you wish to create a new Gateway resource in Kubernetes, a Frontend resource should be provisioned in Azure prior and referenced by the Gateway resource. Deletion of the Frontend resource is responsible by the Azure administrator and isn't deleted when the Gateway resource in Kubernetes is deleted.
8485
- **Managed by ALB Controller:** In this deployment strategy ALB Controller deployed in Kubernetes is responsible for the lifecycle of the Application Gateway for Containers resource and its sub resources. ALB Controller creates Application Gateway for Containers resource when an ApplicationLoadBalancer custom resource is defined on the cluster and its lifecycle is based on the lifecycle of the custom resource.
8586
- **In Gateway API:** Every time a Gateway resource is created referencing the ApplicationLoadBalancer resource, ALB Controller provisions a new Frontend resource and manage its lifecycle based on the lifecycle of the Gateway resource.
@@ -111,7 +112,7 @@ Application Gateway for Containers is currently offered in the following regions
111112

112113
### Implementation of Gateway API
113114

114-
ALB Controller implements version [v1](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io%2fv1) of the [Gateway API](https://gateway-api.sigs.k8s.io/)
115+
ALB Controller implements version [v1](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io%2fv1) of the [Gateway API](https://gateway-api.sigs.k8s.io/).
115116

116117
| Gateway API Resource | Support | Comments |
117118
| ------------------------- | ------- | ------------ |
@@ -122,7 +123,7 @@ ALB Controller implements version [v1](https://gateway-api.sigs.k8s.io/reference
122123

123124
### Implementation of Ingress API
124125

125-
ALB Controller implements support for [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/)
126+
ALB Controller implements support for [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/).
126127

127128
| Ingress API Resource | Support | Comments |
128129
| ------------------------- | ------- | ------------ |

articles/azure-arc/resource-bridge/overview.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: references_regions
1010

1111
Azure Arc resource bridge is a Microsoft managed product that is part of the core Azure Arc platform. It is designed to host other Azure Arc services. In this release, the resource bridge supports VM self-servicing and management from Azure, for virtualized Windows and Linux virtual machines hosted in an on-premises environment on Azure Stack HCI ([Azure Arc VM management](/azure-stack/hci/manage/azure-arc-vm-management-overview)), VMware ([Arc-enabled VMware vSphere](../vmware-vsphere/overview.md)), and System Center Virtual Machine Manager ([Arc-enabled SCVMM](../system-center-virtual-machine-manager/overview.md)).
1212

13-
Azure Arc resource bridge is a Kubernetes management cluster installed on the customer’s on-premises infrastructure. The resource bridge is provided credentials to the infrastructure control plane that allows it to apply guest management services on the on-premises resources. Arc resource bridge enables projection of on-premises resources as ARM resources and management from ARM as "Arc-enabled" Azure resources.
13+
Azure Arc resource bridge is a Kubernetes management cluster installed on the customer’s on-premises infrastructure as an appliance VM (aka Arc appliance). The resource bridge is provided credentials to the infrastructure control plane that allows it to apply guest management services on the on-premises resources. Arc resource bridge enables projection of on-premises resources as ARM resources and management from ARM as "Arc-enabled" Azure resources.
1414

1515
Arc resource bridge delivers the following benefits:
1616

@@ -144,6 +144,11 @@ There could be instances where supported versions are not sequential. For exampl
144144

145145
Arc resource bridge typically releases a new version on a monthly cadence, at the end of the month. Delays might occur that could push the release date further out. Regardless of when a new release comes out, if you are within n-3 supported versions (starting with 1.0.15), then your Arc resource bridge version is supported. To stay updated on releases, visit the [Arc resource bridge release notes](https://github.com/Azure/ArcResourceBridge/releases) on GitHub. To learn more about upgrade options, visit [Upgrade Arc resource bridge](upgrade.md).
146146

147+
### Private Link Support
148+
149+
Arc resource bridge does not currently support private link.
150+
151+
147152
## Next steps
148153

149154
* Learn how [Azure Arc-enabled VMware vSphere extends Azure's governance and management capabilities to VMware vSphere infrastructure](../vmware-vsphere/overview.md).

articles/azure-resource-manager/templates/deploy-to-management-group.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Deploy resources to management group
33
description: Describes how to deploy resources at the management group scope in an Azure Resource Manager template.
44
ms.topic: conceptual
5-
ms.date: 03/20/2024
5+
ms.date: 03/26/2024
66
ms.custom: devx-track-azurepowershell, devx-track-azurecli, devx-track-arm-template
77
---
88

@@ -130,6 +130,8 @@ When deploying to a management group, you can deploy resources to:
130130
* resource groups in the management group
131131
* the tenant for the resource group
132132

133+
[!INCLUDE [Scope transitions](../../../includes/resource-manager-scope-transition.md)]
134+
133135
An [extension resource](scope-extension-resources.md) can be scoped to a target that is different than the deployment target.
134136

135137
The user deploying the template must have access to the specified scope.

articles/azure-resource-manager/templates/deploy-to-resource-group.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy resources to resource groups
33
description: Describes how to deploy resources in an Azure Resource Manager template. It shows how to target more than one resource group.
44
ms.topic: conceptual
55
ms.custom: devx-track-arm-template
6-
ms.date: 03/20/2024
6+
ms.date: 03/26/2024
77
---
88

99
# Resource group deployments with ARM templates
@@ -85,6 +85,8 @@ When deploying to a resource group, you can deploy resources to:
8585
* any subscription in the tenant
8686
* the tenant for the resource group
8787

88+
[!INCLUDE [Scope transitions](../../../includes/resource-manager-scope-transition.md)]
89+
8890
An [extension resource](scope-extension-resources.md) can be scoped to a target that is different than the deployment target.
8991

9092
The user deploying the template must have access to the specified scope.

0 commit comments

Comments
 (0)