Merge branch 'main' into feature/move-storage-packages

Azure · Oct 4, 2023 · 6683103 · 6683103
2 parents 8fbba9a + b7c6452
commit 6683103
Show file tree

Hide file tree

Showing 38 changed files with 21,717 additions and 17 deletions.
diff --git a/.github/workflows/api-docs-repo.yaml b/.github/workflows/api-docs-repo.yaml
@@ -71,10 +71,11 @@ jobs:
           docker exec "$container_id" task controller:gen-crd-docs
 
       # After generating the API docs (above), regenerate our index files as now new CRDs can be linked to their docs
+      # Have to force this to ensure the index files are updated
       - name: Generate Index files
         run: |
           container_id=${{ env.container_id }}
-          docker exec "$container_id" task controller:generate-types
+          docker exec "$container_id" task controller:generate-types --force
 
       # Workaround for getting "Permission denied" errors when trying to stage files
       - name: Take Ownership

diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -3,7 +3,9 @@ on:
   push:
     branches:
       - main
-
+    paths:
+      - "docs/**"
+
 jobs:
   deploy-site:
     runs-on: ubuntu-latest

diff --git a/docs/hugo/content/reference/_index.md b/docs/hugo/content/reference/_index.md
@@ -14,6 +14,18 @@ These are the resources with Azure Service Operator support committed to our **m
 grouped by the originating ARM service.
 (Newly supported resources will appear in this list prior to inclusion in any ASO release.)
 
+## ApiManagement
+
+To install the CRDs for these resources, your ASO configuration must include `apimanagement.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                                                                                                                              |
+|----------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------|
+| Service  | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml) |
+
 ## AppConfiguration
 
 To install the CRDs for these resources, your ASO configuration must include `appconfiguration.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.

diff --git a/docs/hugo/content/reference/apimanagement/_index.md b/docs/hugo/content/reference/apimanagement/_index.md
@@ -0,0 +1,15 @@
+---
+title: ApiManagement Supported Resources
+linktitle: ApiManagement
+no_list: true
+---
+To install the CRDs for these resources, your ASO configuration must include `apimanagement.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                                                                                                                              |
+|----------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------|
+| Service  | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml) |
+
diff --git a/v2/api/apimanagement/customizations/service_extension_types_gen.go b/v2/api/apimanagement/customizations/service_extension_types_gen.go
diff --git a/v2/api/apimanagement/customizations/structure.txt b/v2/api/apimanagement/customizations/structure.txt
@@ -0,0 +1,3 @@
+// Code generated by azure-service-operator-codegen. DO NOT EDIT.
+github.com/Azure/azure-service-operator/v2/api/apimanagement/customizations
+└── ServiceExtension: Object (0 properties)
diff --git a/v2/api/apimanagement/v1api20220801/doc.go b/v2/api/apimanagement/v1api20220801/doc.go
diff --git a/v2/api/apimanagement/v1api20220801/groupversion_info_gen.go b/v2/api/apimanagement/v1api20220801/groupversion_info_gen.go