Merge branch 'main' into fix/nsg

.github/workflows/live-validation.yml

@@ -1,14 +1,15 @@
 name: Live Azure Validation
 on:
   schedule:
-    # 13:00 UTC is a time when both US and NZ are asleep (or headed in that direction)
-    - cron: "0 13 * * *"
+    # 5:35 pm every Sunday (UTC)
+    # to ensure the live validation runs weekly
+    - cron: "35 17 * * 0"
   workflow_dispatch:
 
 jobs:
   test-generator:
     concurrency: live-resources # only permit one run at a time
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, 1ES.Pool=aso-1es-pool]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/visualize-repo.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Update ASO v1 diagram
         uses: githubocto/repo-visualizer@main
         with:
-          excluded_paths: "ignore,.github,v2"
+          excluded_paths: "ignore,.github,v2,docs,hack,scripts/v2"
           output_file: "docs/hugo/content/contributing/aso-v1-structure.svg"
           commit_message: "Updating visualization for ASO v1"
           should_push: false

Taskfile.yml

@@ -538,7 +538,6 @@ tasks:
     dir: "{{.CONTROLLER_ROOT}}"
     deps:
       - controller:test-integration-envtest-live
-      - controller:ci-integration-tests
 
   controller:generate-types:
     desc: Run {{.GENERATOR_APP}} to generate input files for controller-gen for {{.CONTROLLER_APP}}.

docs/hugo/content/guide/upgrading.md

@@ -35,27 +35,37 @@ We recommend that you upgrade ASO using the same tool you installed it with.
 **Note:** The instructions below all assume you're upgrading from the previous version (N-1) to the latest version (vN). Please follow 
 the [Recommended upgrade pattern](#recommended-upgrade-pattern) for upgrading multiple versions. 
 
-### kubectl apply
-
-The operator can be upgraded simply by running the same command you used to install it: 
-
-```bash
-kubectl apply --server-side=true -f https://github.com/Azure/azure-service-operator/releases/download/v2.0.0/azureserviceoperator_v2.0.0.yaml
-```
-
-### Helm
+{{< tabpane text=true left=true >}}
+{{% tab header="Helm" %}}
 
 ```bash
 helm repo add aso2 https://raw.githubusercontent.com/Azure/azure-service-operator/main/v2/charts
 helm repo update
-helm upgrade --devel --version v2.0.0 aso2 aso2/azure-service-operator \ 
+helm upgrade --version v2.0.0 aso2 aso2/azure-service-operator \ 
         --namespace=azureserviceoperator-system \
         --set azureSubscriptionID=$AZURE_SUBSCRIPTION_ID \
         --set azureTenantID=$AZURE_TENANT_ID \
         --set azureClientID=$AZURE_CLIENT_ID \
         --set azureClientSecret=$AZURE_CLIENT_SECRET
 ```
 
+Add `--crdPattern` if you want to install any of the new resources included in the new release. 
+
+{{% /tab %}}
+{{% tab header="YAML" %}}
+
+The operator can be upgraded simply by running the same command you used to install it: 
+
+```bash
+kubectl apply --server-side=true -f https://github.com/Azure/azure-service-operator/releases/download/v2.0.0/azureserviceoperator_v2.0.0.yaml
+```
+
+Don't skip the `--server-side=true` flag, as it's required for the upgrade to work correctly.
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+
 ## Supported Versions
 
 We provide best effort support via GitHub for ASO, focusing on the latest version and the previous version. If you're running an older version, we may ask you to upgrade to the latest release before we can help you.

docs/hugo/content/reference/_index.md

@@ -195,6 +195,15 @@ These resource versions are deprecated and will be removed in an upcoming ASO re
 
 ## ContainerService
 
+### 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                                                                                                                                                                |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [TrustedAccessRoleBinding](https://azure.github.io/azure-service-operator/reference/containerservice/v1api20230202preview/#containerservice.azure.com/v1api20230202preview.TrustedAccessRoleBinding) | 2023-02-02-preview | v1api20230202preview | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/containerservice/v1api20230202preview/v1api20230202preview_trustedaccessrolebinding.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.
@@ -236,10 +245,10 @@ These resource(s) are available for use in the current release of ASO. Different
 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                                                                                                                                        |
-|--------------------------|-------------|---------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| BackupVault              | 2023-01-01  | v1api20230101 | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dataprotection/v1api/v1api20230101_backupvault.yaml)              |
-| BackupVaultsBackupPolicy | 2023-01-01  | v1api20230101 | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dataprotection/v1api/v1api20230101_backupvaultsbackuppolicy.yaml) |
+| Resource                                                                                                                                                                           | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                        |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| [BackupVault](https://azure.github.io/azure-service-operator/reference/dataprotection/v1api20230101/#dataprotection.azure.com/v1api20230101.BackupVault)                           | 2023-01-01  | v1api20230101 | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dataprotection/v1api/v1api20230101_backupvault.yaml)              |
+| [BackupVaultsBackupPolicy](https://azure.github.io/azure-service-operator/reference/dataprotection/v1api20230101/#dataprotection.azure.com/v1api20230101.BackupVaultsBackupPolicy) | 2023-01-01  | v1api20230101 | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dataprotection/v1api/v1api20230101_backupvaultsbackuppolicy.yaml) |
 
 ## DBforMariaDB
 

docs/hugo/content/reference/containerservice/_index.md

@@ -3,6 +3,15 @@ title: ContainerService Supported Resources
 linktitle: ContainerService
 no_list: true
 ---
+### 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                                                                                                                                                                |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [TrustedAccessRoleBinding](https://azure.github.io/azure-service-operator/reference/containerservice/v1api20230202preview/#containerservice.azure.com/v1api20230202preview.TrustedAccessRoleBinding) | 2023-02-02-preview | v1api20230202preview | v2.2.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/containerservice/v1api20230202preview/v1api20230202preview_trustedaccessrolebinding.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.