Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller…

…-runtime-0.16.2

.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

.github/workflows/pr-validation.yml

@@ -41,7 +41,22 @@ jobs:
             sha='${{ github.sha }}'
           fi
 
-          go get "$repo/v2@$sha"
+          # Give GitHub some time to make the commit available
+          sleep 10
+
+          # Sometimes it can take https://proxy.golang.org up to a minute for the latest commit to be available.
+          # See the FAQ at https://proxy.golang.org/
+          FAILED=1
+          for i in {1..5}; do
+            if go get "$repo/v2@$sha" ; then
+              FAILED=0
+              break
+            fi
+            echo "Failed to 'go get' $repo/v2@$sha, retrying in 60 seconds…"
+            sleep 60
+          done
+
+          exit $FAILED
 
   test-generator:
     runs-on: [self-hosted, 1ES.Pool=aso-1es-pool]

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](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.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.
@@ -565,12 +577,12 @@ To install the CRDs for these resources, your ASO configuration must include `ne
 
 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                                                                                                                                                       |
-|----------------------------------------|-------------|---------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| TrafficManagerProfile                  | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofile.yaml)                  |
-| TrafficManagerProfilesAzureEndpoint    | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesazureendpoint.yaml)    |
-| TrafficManagerProfilesExternalEndpoint | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesexternalendpoint.yaml) |
-| TrafficManagerProfilesNestedEndpoint   | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesnestedendpoint.yaml)   |
+| Resource                                                                                                                                                                                         | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                                       |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [TrafficManagerProfile](https://azure.github.io/azure-service-operator/reference/network/v1api20220401/#network.azure.com/v1api20220401.TrafficManagerProfile)                                   | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofile.yaml)                  |
+| [TrafficManagerProfilesAzureEndpoint](https://azure.github.io/azure-service-operator/reference/network/v1api20220401/#network.azure.com/v1api20220401.TrafficManagerProfilesAzureEndpoint)       | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesazureendpoint.yaml)    |
+| [TrafficManagerProfilesExternalEndpoint](https://azure.github.io/azure-service-operator/reference/network/v1api20220401/#network.azure.com/v1api20220401.TrafficManagerProfilesExternalEndpoint) | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesexternalendpoint.yaml) |
+| [TrafficManagerProfilesNestedEndpoint](https://azure.github.io/azure-service-operator/reference/network/v1api20220401/#network.azure.com/v1api20220401.TrafficManagerProfilesNestedEndpoint)     | 2022-04-01  | v1api20220401 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/network/v1api20220401/v1api20220401_trafficmanagerprofilesnestedendpoint.yaml)   |
 
 ### Released
 

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](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.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) |
+