Merge pull request #560 from microsoft/hb-waf-tag-update

ci: update image tag to latest_waf

Author: Prajwal-Microsoft

.github/workflows/deploy.yml

@@ -126,13 +126,13 @@ jobs:
           set -e
           # set image tag based on branch
           if [[ "${{ env.BRANCH_NAME }}" == "main" ]]; then
-            IMAGE_TAG="latest"
+            IMAGE_TAG="latest_waf"
           elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then
             IMAGE_TAG="dev"
           elif [[ "${{ env.BRANCH_NAME }}" == "demo" ]]; then
             IMAGE_TAG="demo"
           else
-            IMAGE_TAG="latest"
+            IMAGE_TAG="latest_waf"
           fi
 
           az deployment group create \

.github/workflows/docker-build-and-push.yml

@@ -58,7 +58,7 @@ jobs:
         id: determine_tag
         run: |
           if [[ "${{ github.ref_name }}" == "main" ]]; then
-            echo "tagname=latest" >> $GITHUB_OUTPUT
+            echo "tagname=latest_waf" >> $GITHUB_OUTPUT
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
             echo "tagname=dev" >> $GITHUB_OUTPUT
           elif [[ "${{ github.ref_name }}" == "demo" ]]; then

docs/CustomizingAzdParameters.md

@@ -18,7 +18,7 @@ By default this template will use the environment name as the prefix to prevent
 | `AZURE_ENV_OPENAI_API_VERSION`                 | string  | `2025-01-01-preview`                   | Specifies the API version for Azure OpenAI.                    |
 | `AZURE_ENV_MODEL_CAPACITY`             | integer | `30`                         | Sets the GPT model capacity (based on what's available in your subscription). |
 | `AZURE_ENV_EMBEDDING_MODEL_NAME`       | string  | `text-embedding-ada-002`   | Sets the name of the embedding model to use.                                  |
-| `AZURE_ENV_IMAGETAG`       | string  | `latest`   | Set the Image tag Like (allowed values: latest, dev, hotfix)                                   |
+| `AZURE_ENV_IMAGETAG`       | string  | `latest_waf`   | Set the Image tag Like (allowed values: latest_waf, dev, hotfix)                                   |
 | `AZURE_ENV_EMBEDDING_MODEL_CAPACITY`   | integer | `80`                         | Sets the capacity for the embedding model deployment.                         |
 | `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string  | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md)  | Reuses an existing Log Analytics Workspace instead of creating a new one.     |
 | `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID`    | string  | Guid to get your existing AI Foundry Project resource ID           | Reuses an existing AIFoundry and AIFoundryProject instead of creating a new one.  |

docs/DeploymentGuide.md

@@ -149,7 +149,7 @@ When you start the deployment, most parameters will have **default values**, but
 | **GPT Model Deployment Capacity**    | Configure the capacity for **GPT model deployments** (in thousands).                          | `30k`                    |
 | **Embedding Model**                  | The embedding model used by the app.                                                          | `text-embedding-ada-002` |
 | **Embedding Model Capacity**         | Configure the capacity for **embedding model deployments** (in thousands).                    | `80k`                    |
-| **Image Tag**                        | Image version for deployment (allowed: `latest`, `dev`, `hotfix`).                            | `latest`                 |
+| **Image Tag**                        | Image version for deployment (allowed: `latest_waf`, `dev`, `hotfix`).                            | `latest_waf`                 |
 | **Existing Log Analytics Workspace** | If reusing a Log Analytics Workspace, specify the ID.                                         | *(none)*                 |
 
 

infra/main.bicep

@@ -116,7 +116,7 @@ param enablePrivateNetworking bool = false
 param acrName string = 'byocgacontainerreg'  // testapwaf
 
 @description('Optional. Image Tag.')
-param imageTag string = 'latest'  // waf
+param imageTag string = 'latest_waf'
 
 @description('Optional. Enable/Disable usage telemetry for module.')
 param enableTelemetry bool = true

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "17149382688370834876"
+      "templateHash": "3241607047247621550"
     },
     "name": "Document Generation Solution Accelerator",
     "description": "CSA CTO Gold Standard Solution Accelerator for Document Generation.\n"
@@ -218,7 +218,7 @@
     },
     "imageTag": {
       "type": "string",
-      "defaultValue": "latest",
+      "defaultValue": "latest_waf",
       "metadata": {
         "description": "Optional. Image Tag."
       }

infra/main.parameters.json

@@ -33,7 +33,7 @@
       "value": "${AZURE_ENV_EMBEDDING_MODEL_CAPACITY}"
     },
     "imageTag": {
-      "value": "${AZURE_ENV_IMAGETAG}"
+      "value": "${AZURE_ENV_IMAGETAG=latest_waf}"
     },
     "existingLogAnalyticsWorkspaceId": {
       "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
@@ -42,4 +42,4 @@
       "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
     }
   }
-}
+}

infra/main.waf.parameters.json

@@ -33,7 +33,7 @@
       "value": "${AZURE_ENV_EMBEDDING_MODEL_CAPACITY}"
     },
     "imageTag": {
-      "value": "${AZURE_ENV_IMAGETAG}"
+      "value": "${AZURE_ENV_IMAGETAG=latest_waf}"
     },
     "enableTelemetry": {
       "value": "${AZURE_ENV_ENABLE_TELEMETRY}"
@@ -60,4 +60,4 @@
       "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
     }
   }
-}
+}