feat(terraform): add source registry variable and update outputs for container imports

Co-authored-by: Steven Murawski <steven.murawski@microsoft.com>

Author: pauldotyu

.github/workflows/test-e2e.yaml

@@ -45,8 +45,12 @@ jobs:
       - name: Turn on Helm support for AKS
         run: azd config set alpha.aks.helm on
 
+      - name: Set helm chart location
+        run: sed -i 's/azure-samples.github.io/${{ github.repository_owner }}.github.io/' azure.yaml
+
       - name: Provision and deploy
-        run: azd up --no-prompt
+        run: |
+          azd up --no-prompt
         env:
           AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}

azd-hooks/postprovision.ps1

@@ -11,9 +11,12 @@ if (($env:DEPLOY_AZURE_CONTAINER_REGISTRY -like "true") -and ($env:BUILD_CONTAIN
 } 
 elseif (($env:DEPLOY_AZURE_CONTAINER_REGISTRY -like "true") -and ($env:BUILD_CONTAINERS -like "false")) {
   echo "Import container images"
+  if ([string]::IsNullOrEmpty($env:SOURCE_REGISTRY)){
+    $env:SOURCE_REGISTRY = 'ghrc.io/azure-samples'
+  }
   foreach ($service in $services) {
     echo "Importing aks-store-demo/${service}:latest"
-    az acr import --name $env:AZURE_REGISTRY_NAME --source ghcr.io/azure-samples/aks-store-demo/${service}:latest --image aks-store-demo/${service}:latest
+    az acr import --name $env:AZURE_REGISTRY_NAME --source $env:SOURCE_REGISTRY/aks-store-demo/${service}:latest --image aks-store-demo/${service}:latest
   }
 } 
 else {

azd-hooks/postprovision.sh

@@ -10,9 +10,17 @@ if [ "$DEPLOY_AZURE_CONTAINER_REGISTRY" == "true" ] && [ "$BUILD_CONTAINERS" ==
   done
 elif [ "$DEPLOY_AZURE_CONTAINER_REGISTRY" == "true" ] && ([ -z "$BUILD_CONTAINERS" ] || [ "$BUILD_CONTAINERS" == "false" ]); then
   echo "Import container images"
+  # Default SOURCE_REGISTRY if empty or unset
+  if [ -z "${SOURCE_REGISTRY}" ]; then
+    SOURCE_REGISTRY="ghcr.io/azure-samples"
+  fi
+
   for service in "${services[@]}"; do
     echo "Importing aks-store-demo/${service}:latest"
-    az acr import --name ${AZURE_REGISTRY_NAME} --source ghcr.io/pauldotyu/aks-store-demo/${service}:latest --image aks-store-demo/${service}:latest
+    az acr import \
+      --name "${AZURE_REGISTRY_NAME}" \
+      --source "${SOURCE_REGISTRY}/aks-store-demo/${service}:latest" \
+      --image "aks-store-demo/${service}:latest"
   done
 else 
   echo "No BUILD_CONTAINERS variable set, skipping container build/import"

azure.yaml

@@ -61,7 +61,7 @@ services:
       helm:
         repositories:
           - name: aks-store-demo
-            url: https://pauldotyu.github.io/aks-store-demo
+            url: https://azure-samples.github.io/aks-store-demo
         releases:
           - name: demo
             chart: aks-store-demo/aks-store-demo-chart

infra/bicep/main.bicep

@@ -64,6 +64,9 @@ param imageGenerationModelCapacity int = 1
 @description('value of the current IP address for network access')
 param currentIpAddress string
 
+@description('value of source registry to use for image imports')
+param sourceRegistry string = 'ghcr.io/azure-samples'
+
 // generate a unique string based on the resource group id
 // this is used to ensure that each resource name is unique
 var name = '${appEnvironment}${take(uniqueString(subscription().id, appEnvironment), 4)}'
@@ -193,5 +196,5 @@ output AZURE_DATABASE_API string = cosmosDBAccountKind == 'MongoDB' ? 'mongodb'
 output AZURE_REGISTRY_NAME string = deployAzureContainerRegistry ? aks.outputs.registryName : ''
 output AZURE_REGISTRY_URI string = deployAzureContainerRegistry
   ? aks.outputs.registryLoginServer
-  : 'ghcr.io/azure-samples'
+  : sourceRegistry
 output AZURE_TENANT_ID string = tenant().tenantId

infra/bicep/main.parameters.json

@@ -40,6 +40,9 @@
     },
     "deployImageGenerationModel": {
       "value": "${DEPLOY_AZURE_OPENAI_DALL_E_MODEL=false}"
+    },
+    "source_registry": {
+      "value": "${SOURCE_REGISTRY}"
     }
   }
 }

infra/terraform/main.tfvars.json

@@ -9,5 +9,6 @@
   "cosmosdb_account_kind": "${AZURE_COSMOSDB_ACCOUNT_KIND}",
   "deploy_azure_openai": "${DEPLOY_AZURE_OPENAI}",
   "azure_openai_location": "${AZURE_OPENAI_LOCATION}",
-  "deploy_image_generation_model": "${DEPLOY_AZURE_OPENAI_DALL_E_MODEL}"
+  "deploy_image_generation_model": "${DEPLOY_AZURE_OPENAI_DALL_E_MODEL}",
+  "source_registry": "${SOURCE_REGISTRY}"
 }

infra/terraform/outputs.tf

@@ -76,7 +76,7 @@ output "AZURE_REGISTRY_NAME" {
 }
 
 output "AZURE_REGISTRY_URI" {
-  value = local.deploy_azure_container_registry ? module.acr[0].resource.login_server : "ghcr.io/pauldotyu"
+  value = local.deploy_azure_container_registry ? module.acr[0].resource.login_server : var.source_registry
 }
 
 output "AZURE_TENANT_ID" {

infra/terraform/variables.tf

@@ -120,3 +120,9 @@ variable "image_generation_model_type" {
   type        = string
   default     = "Standard"
 }
+
+variable "source_registry" {
+  description = "value of source registry to use for image imports"
+  type        = string
+  default     = "ghcr.io/azure-samples"
+}