ACI recipe pack and related refactors

.github/scripts/publish-bicep-recipe.sh

@@ -17,7 +17,7 @@
 # ------------------------------------------------------------
 
 # =============================================================================
-# Publish one Kubernetes Bicep recipe to a container registry under every tag in
+# Publish one Bicep recipe to a container registry under every tag in
 # $TAGS. Called once per recipe by the publish-bicep-recipes workflow, which
 # runs the invocations as parallel steps in a single job.
 #

.github/scripts/release/build-recipe-pack-bundle.sh

@@ -21,7 +21,7 @@
 # -----------------------------------------------------------------------------
 # Package a recipe pack into a release bundle plus a checksums file. The bundle
 # contains the pack's Bicep templates and its README.md, laid out under the
-# repo-relative path (e.g. `recipe-packs/kubernetes/default-recipepack.bicep`) so
+# repo-relative path (e.g. `recipe-packs/kubernetes/kubernetes-recipe-pack.bicep`) so
 # it extracts back into the same tree. This is the recipe pack counterpart of
 # build-namespace-bundle.sh and shares its bundling helpers.
 #

.github/workflows/publish-bicep-recipes.yaml

@@ -2,7 +2,7 @@
 ---
 name: Publish Bicep Recipes
 
-# Publishes the Kubernetes Bicep recipes to GHCR as OCI artifacts.
+# Publishes the repository's Bicep recipes to GHCR as OCI artifacts.
 #
 # Every publish is tagged with the commit SHA it was built from, and that SHA
 # tag is what makes the recipes addressable from Radius. A released `rad`
@@ -134,11 +134,19 @@ jobs:
             run: ./.github/scripts/publish-bicep-recipe.sh rediscaches Data/redisCaches/recipes/kubernetes/bicep/kubernetes-redis.bicep
           - name: Publish rabbitmq
             run: ./.github/scripts/publish-bicep-recipe.sh rabbitmq Messaging/rabbitMQ/recipes/kubernetes/bicep/kubernetes-rabbitmq.bicep
+          # Azure ACI recipes wired by the azure-aci recipe pack. These are not
+          # Kubernetes recipes, so they publish to their own GHCR namespace.
+          - name: Publish azure-aci containers
+            run: REGISTRY=ghcr.io/radius-project/azure-aci-recipes ./.github/scripts/publish-bicep-recipe.sh containers Compute/containers/recipes/azure/bicep/azure-aci-containers.bicep
+          - name: Publish azure-aci persistentvolumes
+            run: REGISTRY=ghcr.io/radius-project/azure-aci-recipes ./.github/scripts/publish-bicep-recipe.sh persistentvolumes Compute/persistentVolumes/recipes/azure/bicep/azure-file-volumes.bicep
+          - name: Publish azure-aci secrets
+            run: REGISTRY=ghcr.io/radius-project/azure-aci-recipes ./.github/scripts/publish-bicep-recipe.sh secrets Security/secrets/recipes/azure/bicep/azure-keyvault-secrets.bicep
 
       - name: Summarize
         run: |
           {
-            echo "Published the Kubernetes Bicep recipes to \`$REGISTRY\` with tags \`$TAGS\`."
+            echo "Published the Bicep recipes to GHCR with tags \`$TAGS\`."
             echo ""
             echo "Radius pins these recipes by commit SHA, so \`$GITHUB_SHA\` is now a resolvable tag for every recipe above."
           } >>"$GITHUB_STEP_SUMMARY"

.github/workflows/release-recipe-pack.yaml

@@ -51,7 +51,8 @@ on:
         type: choice
         required: true
         options:
-          - azure
+          - azure-aks
+          - azure-aci
           - kubernetes
       bump:
         description: Semantic version bump

AI/models/README.md

@@ -22,7 +22,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/cognitive-services/account:0.15.0` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/cognitive-services/account:0.15.0` |
 
 ## Using the resource type
 

AI/search/README.md

@@ -21,7 +21,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/search/search-service:0.12.2` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/search/search-service:0.12.2` |
 
 ## Using the resource type
 

Data/mongoDatabases/README.md

@@ -22,7 +22,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `avm/res/document-db/database-account` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `avm/res/document-db/database-account` |
 
 ## Using the resource type
 

Data/mySqlDatabases/README.md

@@ -25,7 +25,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `avm/res/db-for-my-sql/flexible-server` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `avm/res/db-for-my-sql/flexible-server` |
 
 ## Using the resource type
 

Data/postgreSqlDatabases/README.md

@@ -26,7 +26,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/aks-recipepack.bicep`](../../recipe-packs/azure/aks-recipepack.bicep) | Direct module — Azure Verified Module `avm/res/db-for-postgre-sql/flexible-server` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `avm/res/db-for-postgre-sql/flexible-server` |
 
 ## Using the resource type
 

Data/redisCaches/README.md

@@ -23,8 +23,8 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `avm/res/cache/redis-enterprise` |
-| Kubernetes | [`recipe-packs/kubernetes/default-recipepack.bicep`](../../recipe-packs/kubernetes/default-recipepack.bicep) | In-cluster Redis `Deployment` + `Service` [`recipes/kubernetes`](recipes/kubernetes) |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `avm/res/cache/redis-enterprise` |
+| Kubernetes | [`recipe-packs/kubernetes/kubernetes-recipe-pack.bicep`](../../recipe-packs/kubernetes/kubernetes-recipe-pack.bicep) | In-cluster Redis `Deployment` + `Service` [`recipes/kubernetes`](recipes/kubernetes) |
 
 ## Using the resource type
 

Data/sqlServerDatabases/README.md

@@ -24,7 +24,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/sql/server:0.21.4` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/sql/server:0.21.4` |
 
 ## Using the resource type
 

Messaging/kafka/README.md

@@ -22,7 +22,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `avm/res/event-hub/namespace` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `avm/res/event-hub/namespace` |
 
 ## Using the resource type
 

Messaging/rabbitMQ/README.md

@@ -24,8 +24,8 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/aks-recipepack.bicep`](../../recipe-packs/azure/aks-recipepack.bicep) | In-cluster RabbitMQ `Deployment` + `Service` on AKS [`recipes/kubernetes`](recipes/kubernetes) |
-| Kubernetes | [`recipe-packs/kubernetes/default-recipepack.bicep`](../../recipe-packs/kubernetes/default-recipepack.bicep) | In-cluster RabbitMQ `Deployment` + `Service` [`recipes/kubernetes`](recipes/kubernetes) |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | In-cluster RabbitMQ `Deployment` + `Service` on AKS [`recipes/kubernetes`](recipes/kubernetes) |
+| Kubernetes | [`recipe-packs/kubernetes/kubernetes-recipe-pack.bicep`](../../recipe-packs/kubernetes/kubernetes-recipe-pack.bicep) | In-cluster RabbitMQ `Deployment` + `Service` [`recipes/kubernetes`](recipes/kubernetes) |
 
 ## Using the resource type
 

README.md

@@ -31,23 +31,26 @@ resource-types-contrib/
 │       └── test/
 │               └── app.bicep           # Developer-facing test application
 └── recipe-packs/                       # Recipe packs cover recipe definitions for all types in the repo
-    ├── azure/                          # Azure recipe pack (recipes for all types + environment)
-    │       ├── README.md               # Documentation for the Azure recipe pack
-    │       └── aks-recipepack.bicep    # Recipe pack wiring Bicep and Terraform recipes
+    ├── azure-aks/                      # Azure AKS recipe pack (Azure services with AKS compute)
+    │       ├── README.md               # Documentation for the Azure AKS recipe pack
+    │       └── aks-recipe-pack.bicep   # Recipe pack wiring the Bicep recipes
+    ├── azure-aci/                      # Azure ACI recipe pack (Azure services with ACI compute)
+    │       ├── README.md               # Documentation for the Azure ACI recipe pack
+    │       └── aci-recipe-pack.bicep   # Recipe pack wiring the Bicep recipes
     ├── aws/                            # AWS recipe pack
     │       ├── README.md
-    │       └── eks-recipepack.bicep
-    ├── kubernetes/                     # Default recipe pack (zero-config, in-cluster)
+    │       └── eks-recipe-pack.bicep
+    ├── kubernetes/                     # Kubernetes recipe pack (zero-config, in-cluster)
             ├── README.md
-            └── default-recipepack.bicep
+            └── kubernetes-recipe-pack.bicep
 
 ```
 
 ## Discovering and using Resource Types and Recipe Packs
 
 Developers can discover the Resource Types in this repository and use them in a Radius application, and platform engineers can use the Recipe Packs to configure how those types are provisioned in an Environment. For a step-by-step guide on discovering, registering, and using Resource Types and Recipe Packs, see [Discovering and Using Resource Types and Recipe Packs](docs/using-resource-types.md).
 
-Every Resource Type in this repository can be registered via `rad resource-type create`. A subset is also registered as defaults in Radius, so they are available out of the box without any user action. The default resource types are paired with the default Recipe Pack under `recipe-packs/default-kubernetes/`, a zero-config, in-cluster Kubernetes pack that ships out of the box, so they can be deployed without any cloud provider configuration. The list of default resource types is managed in the [Radius repository](https://github.com/radius-project/radius) via [`deploy/manifest/defaults.yaml`](https://github.com/radius-project/radius/blob/main/deploy/manifest/defaults.yaml).
+Every Resource Type in this repository can be registered via `rad resource-type create`. A subset is also registered as defaults in Radius, so they are available out of the box without any user action. The default resource types are paired with the default Recipe Pack under `recipe-packs/kubernetes/`, a zero-config, in-cluster Kubernetes pack that ships out of the box, so they can be deployed without any cloud provider configuration. The list of default resource types is managed in the [Radius repository](https://github.com/radius-project/radius) via [`deploy/manifest/defaults.yaml`](https://github.com/radius-project/radius/blob/main/deploy/manifest/defaults.yaml).
 
 ## Contributing
 

Storage/objectStorage/README.md

@@ -25,7 +25,7 @@ Recipes for this resource type are provided through the platform Recipe Packs at
 
 | Platform | Recipe Pack | Recipe source |
 | --- | --- | --- |
-| Azure | [`recipe-packs/azure/bicep-recipepack.bicep`](../../recipe-packs/azure/bicep-recipepack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/storage/storage-account:0.32.1` |
+| Azure | [`recipe-packs/azure-aks/aks-recipe-pack.bicep`](../../recipe-packs/azure-aks/aks-recipe-pack.bicep) | Direct module — Azure Verified Module `mcr.microsoft.com/bicep/avm/res/storage/storage-account:0.32.1` |
 
 ## Using the resource type