Skip to content

Commit

Permalink
Resolving conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@nshekhar221
nshekhar221 committed Oct 15, 2024
1 parent 92e6d8d commit 635dd30
Show file tree
Hide file tree
Showing 9 changed files with 6,496 additions and 1,379 deletions.
Binary file added docs/hugo/content/design/images/pls-pe-differences.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions docs/hugo/content/reference/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,20 @@ Development of these new resources is complete and they will be available in the

These resource(s) are available for use in the current release of ASO. Different versions of a given resource reflect different versions of the Azure ARM API.

| Resource | ARM Version | CRD Version | Supported From | Sample |
|----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------|
| [Redis](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.Redis) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230401_redis.yaml) |
| [Redis](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.Redis) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20201201_redis.yaml) |
| [RedisEnterprise](https://azure.github.io/azure-service-operator/reference/cache/v1api20230701/#cache.azure.com/v1api20230701.RedisEnterprise) | 2023-07-01 | v1api20230701 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230701_redisenterprise.yaml) |
| [RedisEnterprise](https://azure.github.io/azure-service-operator/reference/cache/v1api20210301/#cache.azure.com/v1api20210301.RedisEnterprise) | 2021-03-01 | v1api20210301 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20210301_redisenterprise.yaml) |
| [RedisEnterpriseDatabase](https://azure.github.io/azure-service-operator/reference/cache/v1api20230701/#cache.azure.com/v1api20230701.RedisEnterpriseDatabase) | 2023-07-01 | v1api20230701 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230701_redisenterprisedatabase.yaml) |
| [RedisEnterpriseDatabase](https://azure.github.io/azure-service-operator/reference/cache/v1api20210301/#cache.azure.com/v1api20210301.RedisEnterpriseDatabase) | 2021-03-01 | v1api20210301 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20210301_redisenterprisedatabase.yaml) |
| [RedisFirewallRule](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisFirewallRule) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230401_redisfirewallrule.yaml) |
| [RedisFirewallRule](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisFirewallRule) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20201201_redisfirewallrule.yaml) |
| [RedisLinkedServer](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisLinkedServer) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230401_redislinkedserver.yaml) |
| [RedisLinkedServer](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisLinkedServer) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20201201_redislinkedserver.yaml) |
| [RedisPatchSchedule](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisPatchSchedule) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20230401_redispatchschedule.yaml) |
| [RedisPatchSchedule](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisPatchSchedule) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api/v1api20201201_redispatchschedule.yaml) |
| Resource | ARM Version | CRD Version | Supported From | Sample |
|----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------|
| [Redis](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.Redis) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230401/v1api20230401_redis.yaml) |
| [Redis](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.Redis) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20201201/v1api20201201_redis.yaml) |
| [RedisEnterprise](https://azure.github.io/azure-service-operator/reference/cache/v1api20230701/#cache.azure.com/v1api20230701.RedisEnterprise) | 2023-07-01 | v1api20230701 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230701/v1api20230701_redisenterprise.yaml) |
| [RedisEnterprise](https://azure.github.io/azure-service-operator/reference/cache/v1api20210301/#cache.azure.com/v1api20210301.RedisEnterprise) | 2021-03-01 | v1api20210301 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20210301/v1api20210301_redisenterprise.yaml) |
| [RedisEnterpriseDatabase](https://azure.github.io/azure-service-operator/reference/cache/v1api20230701/#cache.azure.com/v1api20230701.RedisEnterpriseDatabase) | 2023-07-01 | v1api20230701 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230701/v1api20230701_redisenterprisedatabase.yaml) |
| [RedisEnterpriseDatabase](https://azure.github.io/azure-service-operator/reference/cache/v1api20210301/#cache.azure.com/v1api20210301.RedisEnterpriseDatabase) | 2021-03-01 | v1api20210301 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20210301/v1api20210301_redisenterprisedatabase.yaml) |
| [RedisFirewallRule](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisFirewallRule) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230401/v1api20230401_redisfirewallrule.yaml) |
| [RedisFirewallRule](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisFirewallRule) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20201201/v1api20201201_redisfirewallrule.yaml) |
| [RedisLinkedServer](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisLinkedServer) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230401/v1api20230401_redislinkedserver.yaml) |
| [RedisLinkedServer](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisLinkedServer) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20201201/v1api20201201_redislinkedserver.yaml) |
| [RedisPatchSchedule](https://azure.github.io/azure-service-operator/reference/cache/v1api20230401/#cache.azure.com/v1api20230401.RedisPatchSchedule) | 2023-04-01 | v1api20230401 | v2.3.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20230401/v1api20230401_redispatchschedule.yaml) |
| [RedisPatchSchedule](https://azure.github.io/azure-service-operator/reference/cache/v1api20201201/#cache.azure.com/v1api20201201.RedisPatchSchedule) | 2020-12-01 | v1api20201201 | v2.0.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/cache/v1api20201201/v1api20201201_redispatchschedule.yaml) |

## Cdn

Expand Down Expand Up @@ -526,8 +526,8 @@ Development of these new resources is complete and they will be available in the

| Resource | ARM Version | CRD Version | Supported From | Sample |
|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
| [ApplicationSecurityGroup](https://azure.github.io/azure-service-operator/reference/network/v1api20240101/#network.azure.com/v1api20240101.ApplicationSecurityGroup) | 2024-01-01 | v1api20240101 | v2.10.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20240101/v1api20240101_applicationsecuritygroup.yaml) |
| [WebApplicationFirewallPolicy](https://azure.github.io/azure-service-operator/reference/network/v1api20240101/#network.azure.com/v1api20240101.WebApplicationFirewallPolicy) | 2024-01-01 | v1api20240101 | v2.10.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220701/v1api20240101_webapplicationfirewallpolicy.yaml) |
| ApplicationSecurityGroup | 2024-01-01 | v1api20240101 | v2.10.0 | - |

### Released

Expand Down
Loading

0 comments on commit 635dd30

Please sign in to comment.