Merge branch 'main' into feature/new-redis

Azure · Aug 28, 2023 · 5078ee8 · 5078ee8
2 parents 96cb206 + 41622d9
commit 5078ee8
Show file tree

Hide file tree

Showing 34 changed files with 11,703 additions and 1,041 deletions.
diff --git a/docs/hugo/content/reference/_index.md b/docs/hugo/content/reference/_index.md
@@ -143,6 +143,14 @@ These resource versions are deprecated and will be removed in an upcoming ASO re
 
 To install the CRDs for these resources, your ASO configuration must include `compute.azure.com/*` as a one of the configured CRD patterns. See [CRD Management in ASO](https://azure.github.io/azure-service-operator/guide/crd-management/) for details on doing this for both [Helm](https://azure.github.io/azure-service-operator/guide/crd-management/#helm) and [YAML](https://azure.github.io/azure-service-operator/guide/crd-management/#yaml) based installations.
 
+### Next Release
+
+Development of these new resources is complete and they will be available in the next release of ASO.
+
+| Resource          | ARM Version | CRD Version   | Supported From | Sample                                                                                                                          |
+|-------------------|-------------|---------------|----------------|---------------------------------------------------------------------------------------------------------------------------------|
+| DiskEncryptionSet | 2022-07-02  | v1api20220702 | v2.3.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/compute/v1api/v1api20220702_diskencryptionset.yaml) |
+
 ### Released
 
 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.

diff --git a/docs/hugo/content/reference/compute/_index.md b/docs/hugo/content/reference/compute/_index.md
@@ -5,6 +5,14 @@ no_list: true
 ---
 To install the CRDs for these resources, your ASO configuration must include `compute.azure.com/*` as a one of the configured CRD patterns. See [CRD Management in ASO](https://azure.github.io/azure-service-operator/guide/crd-management/) for details on doing this for both [Helm](https://azure.github.io/azure-service-operator/guide/crd-management/#helm) and [YAML](https://azure.github.io/azure-service-operator/guide/crd-management/#yaml) based installations.
 
+### Next Release
+
+Development of these new resources is complete and they will be available in the next release of ASO.
+
+| Resource          | ARM Version | CRD Version   | Supported From | Sample                                                                                                                          |
+|-------------------|-------------|---------------|----------------|---------------------------------------------------------------------------------------------------------------------------------|
+| DiskEncryptionSet | 2022-07-02  | v1api20220702 | v2.3.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/compute/v1api/v1api20220702_diskencryptionset.yaml) |
+
 ### Released
 
 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.

diff --git a/v2/api/compute/customizations/disk_encryption_set_extension_types_gen.go b/v2/api/compute/customizations/disk_encryption_set_extension_types_gen.go
diff --git a/v2/api/compute/customizations/structure.txt b/v2/api/compute/customizations/structure.txt
@@ -1,5 +1,6 @@
 // Code generated by azure-service-operator-codegen. DO NOT EDIT.
 github.com/Azure/azure-service-operator/v2/api/compute/customizations
+├── DiskEncryptionSetExtension: Object (0 properties)
 ├── DiskExtension: Object (0 properties)
 ├── ImageExtension: Object (0 properties)
 ├── SnapshotExtension: Object (0 properties)

diff --git a/v2/api/compute/v1api20200930storage/disk_types_gen.go b/v2/api/compute/v1api20200930storage/disk_types_gen.go
diff --git a/v2/api/compute/v1api20200930storage/disk_types_gen_test.go b/v2/api/compute/v1api20200930storage/disk_types_gen_test.go
diff --git a/v2/api/compute/v1api20200930storage/structure.txt b/v2/api/compute/v1api20200930storage/structure.txt
@@ -300,4 +300,6 @@ github.com/Azure/azure-service-operator/v2/api/compute/v1api20200930storage
 │       ├── Type: *string
 │       └── UniqueId: *string
 ├── augmentConversionForExtendedLocation: Interface
-└── augmentConversionForExtendedLocation_STATUS: Interface
+├── augmentConversionForExtendedLocation_STATUS: Interface
+├── augmentConversionForSourceVault: Interface
+└── augmentConversionForSourceVault_STATUS: Interface