From b0cd5b374e6375d1227929ef6e495f459d15decc Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:12:46 +0530 Subject: [PATCH 01/14] Update main.bicep added - @description('Name of the existing resource group') param existingResourceGroupName string --- infra/main.bicep | 3 +++ 1 file changed, 3 insertions(+) diff --git a/infra/main.bicep b/infra/main.bicep index 58f4db04..75f42cd6 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -9,6 +9,9 @@ param name string @description('Primary location for all resources') param location string +@description('Name of the existing resource group') +param existingResourceGroupName string + @description('Whether the deployment is running on GitHub Actions') param runningOnGh string = '' From e330cc824cac14cf97044e9724b00168da818595 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:15:34 +0530 Subject: [PATCH 02/14] Update main.bicep added existingResourceGroupName at line #38 --- infra/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.bicep b/infra/main.bicep index 75f42cd6..3bbf3d24 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -35,7 +35,7 @@ param principalId string = '' param openAILocation string @description('Name of the OpenAI resource group. If not specified, the resource group name will be generated.') -param openAIResourceGroupName string = '' +param openAIResourceGroupName string = existingResourceGroupName @description('Whether to deploy Azure OpenAI resources') param deployAzureOpenAI bool = true From ff8b43b5ef7027ec6cbdf1dffc7c5532bf60bbca Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:16:33 +0530 Subject: [PATCH 03/14] Update main.bicep added below code at line #73 // Reference the existing resource group resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = { name: existingResourceGroupName } --- infra/main.bicep | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/infra/main.bicep b/infra/main.bicep index 3bbf3d24..ce71d765 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -70,6 +70,11 @@ var chatConfig = { deploymentCapacity: chatDeploymentCapacity != 0 ? chatDeploymentCapacity : 30 } +// Reference the existing resource group +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = { + name: existingResourceGroupName +} + param embedModelName string = '' param embedDeploymentName string = '' param embedDeploymentVersion string = '' From db8e98f86147c200c60469c4acb4fb4752344837 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:38:43 +0530 Subject: [PATCH 04/14] Update main.bicep --- infra/main.bicep | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index ce71d765..46d49f2c 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -9,7 +9,8 @@ param name string @description('Primary location for all resources') param location string -@description('Name of the existing resource group') +@description('Name of the existing resource group to use') +@minLength(1) param existingResourceGroupName string @description('Whether the deployment is running on GitHub Actions') @@ -70,10 +71,6 @@ var chatConfig = { deploymentCapacity: chatDeploymentCapacity != 0 ? chatDeploymentCapacity : 30 } -// Reference the existing resource group -resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = { - name: existingResourceGroupName -} param embedModelName string = '' param embedDeploymentName string = '' @@ -95,12 +92,12 @@ var resourceToken = toLower(uniqueString(subscription().id, name, location)) var prefix = '${name}-${resourceToken}' var tags = { 'azd-env-name': name } -resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { - name: '${name}-rg' - location: location - tags: tags +// Use the existing resource group +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = { + name: existingResourceGroupName } +// PostgreSQL Server var postgresServerName = '${prefix}-postgresql' var postgresDatabaseName = 'postgres' var postgresEntraAdministratorObjectId = principalId @@ -109,7 +106,7 @@ var postgresEntraAdministratorName = 'admin${uniqueString(resourceGroup.id, prin module postgresServer 'core/database/postgresql/flexibleserver.bicep' = { name: 'postgresql' - scope: resourceGroup + scope: existingResourceGroup params: { name: postgresServerName location: location @@ -134,7 +131,7 @@ module postgresServer 'core/database/postgresql/flexibleserver.bicep' = { // Monitor application with Azure Monitor module monitoring 'core/monitor/monitoring.bicep' = { name: 'monitoring' - scope: resourceGroup + scope: existingResourceGroup params: { location: location tags: tags @@ -147,7 +144,7 @@ module monitoring 'core/monitor/monitoring.bicep' = { // Container apps host (including container registry) module containerApps 'core/host/container-apps.bicep' = { name: 'container-apps' - scope: resourceGroup + scope: existingResourceGroup params: { name: 'app' location: location @@ -247,7 +244,7 @@ var secrets = !empty(azureOpenAIKey) ? { module web 'web.bicep' = { name: 'web' - scope: resourceGroup + scope: existingResourceGroup params: { name: webAppName location: location @@ -261,14 +258,10 @@ module web 'web.bicep' = { } } -resource openAIResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = - if (!empty(openAIResourceGroupName)) { - name: !empty(openAIResourceGroupName) ? openAIResourceGroupName : resourceGroup.name - } module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) { name: 'openai' - scope: openAIResourceGroup + scope: existingResourceGroup params: { name: '${prefix}-openai' location: openAILocation @@ -309,7 +302,7 @@ module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) { // USER ROLES module openAIRoleUser 'core/security/role.bicep' = if (empty(runningOnGh)) { - scope: openAIResourceGroup + scope: existingResourceGroup name: 'openai-role-user' params: { principalId: principalId @@ -320,7 +313,7 @@ module openAIRoleUser 'core/security/role.bicep' = // Backend roles module openAIRoleBackend 'core/security/role.bicep' = { - scope: openAIResourceGroup + scope: existingResourceGroup name: 'openai-role-backend' params: { principalId: web.outputs.SERVICE_WEB_IDENTITY_PRINCIPAL_ID From ca3d7f0734015cca88c818e78217eb1c2093aea6 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:47:32 +0530 Subject: [PATCH 05/14] Update main.bicep --- infra/main.bicep | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 46d49f2c..aaede3be 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -36,7 +36,7 @@ param principalId string = '' param openAILocation string @description('Name of the OpenAI resource group. If not specified, the resource group name will be generated.') -param openAIResourceGroupName string = existingResourceGroupName +param openAIResourceGroupName string = '' @description('Whether to deploy Azure OpenAI resources') param deployAzureOpenAI bool = true @@ -71,7 +71,6 @@ var chatConfig = { deploymentCapacity: chatDeploymentCapacity != 0 ? chatDeploymentCapacity : 30 } - param embedModelName string = '' param embedDeploymentName string = '' param embedDeploymentVersion string = '' @@ -97,7 +96,6 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing name: existingResourceGroupName } -// PostgreSQL Server var postgresServerName = '${prefix}-postgresql' var postgresDatabaseName = 'postgres' var postgresEntraAdministratorObjectId = principalId @@ -106,7 +104,7 @@ var postgresEntraAdministratorName = 'admin${uniqueString(resourceGroup.id, prin module postgresServer 'core/database/postgresql/flexibleserver.bicep' = { name: 'postgresql' - scope: existingResourceGroup + scope: resourceGroup params: { name: postgresServerName location: location @@ -131,7 +129,7 @@ module postgresServer 'core/database/postgresql/flexibleserver.bicep' = { // Monitor application with Azure Monitor module monitoring 'core/monitor/monitoring.bicep' = { name: 'monitoring' - scope: existingResourceGroup + scope: resourceGroup params: { location: location tags: tags @@ -144,7 +142,7 @@ module monitoring 'core/monitor/monitoring.bicep' = { // Container apps host (including container registry) module containerApps 'core/host/container-apps.bicep' = { name: 'container-apps' - scope: existingResourceGroup + scope: resourceGroup params: { name: 'app' location: location @@ -244,7 +242,7 @@ var secrets = !empty(azureOpenAIKey) ? { module web 'web.bicep' = { name: 'web' - scope: existingResourceGroup + scope: resourceGroup params: { name: webAppName location: location @@ -258,10 +256,14 @@ module web 'web.bicep' = { } } +resource openAIResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = + if (!empty(openAIResourceGroupName)) { + name: !empty(openAIResourceGroupName) ? openAIResourceGroupName : resourceGroup.name + } module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) { name: 'openai' - scope: existingResourceGroup + scope: openAIResourceGroup params: { name: '${prefix}-openai' location: openAILocation @@ -302,7 +304,7 @@ module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) { // USER ROLES module openAIRoleUser 'core/security/role.bicep' = if (empty(runningOnGh)) { - scope: existingResourceGroup + scope: openAIResourceGroup name: 'openai-role-user' params: { principalId: principalId @@ -313,7 +315,7 @@ module openAIRoleUser 'core/security/role.bicep' = // Backend roles module openAIRoleBackend 'core/security/role.bicep' = { - scope: existingResourceGroup + scope: openAIResourceGroup name: 'openai-role-backend' params: { principalId: web.outputs.SERVICE_WEB_IDENTITY_PRINCIPAL_ID From a6358039f517917217cb5ec7de556c21fef185e8 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 09:51:21 -0800 Subject: [PATCH 06/14] Create an auto-deploy file --- ...r-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml diff --git a/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml b/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml new file mode 100644 index 00000000..f5b2c2df --- /dev/null +++ b/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml @@ -0,0 +1,48 @@ +name: Trigger auto deployment for ragpgpy-gy6v6i7cfj3-ca + +# When this action will be executed +on: + # Automatically trigger it when detected changes in repo + push: + branches: + [ main ] + paths: + - '**' + - '.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml' + + # Allow manual trigger + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + permissions: + id-token: write #This is required for requesting the OIDC JWT Token + contents: read #Required when GH token is used to authenticate with private repo + + steps: + - name: Checkout to the branch + uses: actions/checkout@v2 + + - name: Azure Login + uses: azure/login@v1 + with: + client-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_TENANT_ID }} + subscription-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_SUBSCRIPTION_ID }} + + - name: Build and push container image to registry + uses: azure/container-apps-deploy-action@v2 + with: + appSourcePath: ${{ github.workspace }} + _dockerfilePathKey_: _dockerfilePath_ + registryUrl: ragpgpygy6v6i7cfj3lyregistry.azurecr.io + registryUsername: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_REGISTRY_USERNAME }} + registryPassword: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_REGISTRY_PASSWORD }} + containerAppName: ragpgpy-gy6v6i7cfj3-ca + resourceGroup: ResourceGroup1 + imageToBuild: ragpgpygy6v6i7cfj3lyregistry.azurecr.io/ragpgpy-gy6v6i7cfj3-ca:${{ github.sha }} + _buildArgumentsKey_: | + _buildArgumentsValues_ + + From 538d547e09bcccdd18f30e7ff54f4913b90b9daf Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 23:35:16 +0530 Subject: [PATCH 07/14] Update Dockerfile --- .devcontainer/Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1e40ff4b..c79fae89 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,16 @@ ARG IMAGE=bullseye FROM mcr.microsoft.com/devcontainers/${IMAGE} ENV PYTHONUNBUFFERED 1 +ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends postgresql-client \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/* \ No newline at end of file +# Add the PostgreSQL Apt Repository +RUN apt-get update && \ + apt-get install -y wget gnupg2 && \ + echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ + apt-get update && \ + apt-get -y install --no-install-recommends \ + postgresql-client \ + postgresql-server-dev-14 && \ + apt-get clean -y && \ + rm -rf /var/lib/apt/lists/* From 22732bf4af47e96b7c002ae2061539c09ad52354 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:05:48 -0800 Subject: [PATCH 08/14] Unlink the containerApp ragpgpy-gy6v6i7cfj3-ca from this repo --- ...r-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml diff --git a/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml b/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml deleted file mode 100644 index f5b2c2df..00000000 --- a/.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Trigger auto deployment for ragpgpy-gy6v6i7cfj3-ca - -# When this action will be executed -on: - # Automatically trigger it when detected changes in repo - push: - branches: - [ main ] - paths: - - '**' - - '.github/workflows/ragpgpy-gy6v6i7cfj3-ca-AutoDeployTrigger-465cfe41-121a-4b89-9fd1-1ef18fd00fb9.yml' - - # Allow manual trigger - workflow_dispatch: - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - permissions: - id-token: write #This is required for requesting the OIDC JWT Token - contents: read #Required when GH token is used to authenticate with private repo - - steps: - - name: Checkout to the branch - uses: actions/checkout@v2 - - - name: Azure Login - uses: azure/login@v1 - with: - client-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_TENANT_ID }} - subscription-id: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_AZURE_SUBSCRIPTION_ID }} - - - name: Build and push container image to registry - uses: azure/container-apps-deploy-action@v2 - with: - appSourcePath: ${{ github.workspace }} - _dockerfilePathKey_: _dockerfilePath_ - registryUrl: ragpgpygy6v6i7cfj3lyregistry.azurecr.io - registryUsername: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_REGISTRY_USERNAME }} - registryPassword: ${{ secrets.RAGPGPYGY6V6I7CFJ3CA_REGISTRY_PASSWORD }} - containerAppName: ragpgpy-gy6v6i7cfj3-ca - resourceGroup: ResourceGroup1 - imageToBuild: ragpgpygy6v6i7cfj3lyregistry.azurecr.io/ragpgpy-gy6v6i7cfj3-ca:${{ github.sha }} - _buildArgumentsKey_: | - _buildArgumentsValues_ - - From a8d6602feea99a41d591cb6f9b8f52d19b62cfae Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:12:51 -0800 Subject: [PATCH 09/14] Update Dockerfile --- .devcontainer/Dockerfile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c79fae89..0442569e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,16 +2,7 @@ ARG IMAGE=bullseye FROM mcr.microsoft.com/devcontainers/${IMAGE} ENV PYTHONUNBUFFERED 1 -ENV DEBIAN_FRONTEND=noninteractive -# Add the PostgreSQL Apt Repository -RUN apt-get update && \ - apt-get install -y wget gnupg2 && \ - echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ - wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - apt-get update && \ - apt-get -y install --no-install-recommends \ - postgresql-client \ - postgresql-server-dev-14 && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get -y install --no-install-recommends postgresql-client \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/* From 0a14e3cf5f22b006f3d1adaaefc2017288e5fb4d Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:34:08 -0800 Subject: [PATCH 10/14] Create an auto-deploy file --- ...r-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/testittfft-ixhict44-ca-AutoDeployTrigger-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml diff --git a/.github/workflows/testittfft-ixhict44-ca-AutoDeployTrigger-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml b/.github/workflows/testittfft-ixhict44-ca-AutoDeployTrigger-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml new file mode 100644 index 00000000..ce1e6b44 --- /dev/null +++ b/.github/workflows/testittfft-ixhict44-ca-AutoDeployTrigger-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml @@ -0,0 +1,48 @@ +name: Trigger auto deployment for testittfft-ixhict44-ca + +# When this action will be executed +on: + # Automatically trigger it when detected changes in repo + push: + branches: + [ main ] + paths: + - '**' + - '.github/workflows/testittfft-ixhict44-ca-AutoDeployTrigger-8fa7ae9d-10d9-43e2-b63c-bfe97742caaf.yml' + + # Allow manual trigger + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + permissions: + id-token: write #This is required for requesting the OIDC JWT Token + contents: read #Required when GH token is used to authenticate with private repo + + steps: + - name: Checkout to the branch + uses: actions/checkout@v2 + + - name: Azure Login + uses: azure/login@v1 + with: + client-id: ${{ secrets.TESTITTFFTIXHICT44CA_AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.TESTITTFFTIXHICT44CA_AZURE_TENANT_ID }} + subscription-id: ${{ secrets.TESTITTFFTIXHICT44CA_AZURE_SUBSCRIPTION_ID }} + + - name: Build and push container image to registry + uses: azure/container-apps-deploy-action@v2 + with: + appSourcePath: ${{ github.workspace }} + _dockerfilePathKey_: _dockerfilePath_ + registryUrl: testittfftixhict44koeberegistry.azurecr.io + registryUsername: ${{ secrets.TESTITTFFTIXHICT44CA_REGISTRY_USERNAME }} + registryPassword: ${{ secrets.TESTITTFFTIXHICT44CA_REGISTRY_PASSWORD }} + containerAppName: testittfft-ixhict44-ca + resourceGroup: ResourceGroup1 + imageToBuild: testittfftixhict44koeberegistry.azurecr.io/testittfft-ixhict44-ca:${{ github.sha }} + _buildArgumentsKey_: | + _buildArgumentsValues_ + + From 5a7d00f7bcd32a220da4a5b4394214f2d9fe96e0 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:31:05 -0800 Subject: [PATCH 11/14] Create an auto-deploy file --- ...r-470b45d2-75dc-4f4f-bf14-dde901b82711.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml diff --git a/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml b/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml new file mode 100644 index 00000000..5e2536e7 --- /dev/null +++ b/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml @@ -0,0 +1,48 @@ +name: Trigger auto deployment for ragpgpy1-rn5pyrt7ct-ca + +# When this action will be executed +on: + # Automatically trigger it when detected changes in repo + push: + branches: + [ main ] + paths: + - '**' + - '.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml' + + # Allow manual trigger + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + permissions: + id-token: write #This is required for requesting the OIDC JWT Token + contents: read #Required when GH token is used to authenticate with private repo + + steps: + - name: Checkout to the branch + uses: actions/checkout@v2 + + - name: Azure Login + uses: azure/login@v1 + with: + client-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_TENANT_ID }} + subscription-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_SUBSCRIPTION_ID }} + + - name: Build and push container image to registry + uses: azure/container-apps-deploy-action@v2 + with: + appSourcePath: ${{ github.workspace }} + _dockerfilePathKey_: _dockerfilePath_ + registryUrl: ragpgpy1rn5pyrt7ctpmaregistry.azurecr.io + registryUsername: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_REGISTRY_USERNAME }} + registryPassword: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_REGISTRY_PASSWORD }} + containerAppName: ragpgpy1-rn5pyrt7ct-ca + resourceGroup: ResourceGroup1 + imageToBuild: ragpgpy1rn5pyrt7ctpmaregistry.azurecr.io/ragpgpy1-rn5pyrt7ct-ca:${{ github.sha }} + _buildArgumentsKey_: | + _buildArgumentsValues_ + + From 61ab731e19491b5f911c473100c488bb1d0b8760 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:49:01 -0800 Subject: [PATCH 12/14] Unlink the containerApp ragpgpy1-rn5pyrt7ct-ca from this repo --- ...r-470b45d2-75dc-4f4f-bf14-dde901b82711.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml diff --git a/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml b/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml deleted file mode 100644 index 5e2536e7..00000000 --- a/.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Trigger auto deployment for ragpgpy1-rn5pyrt7ct-ca - -# When this action will be executed -on: - # Automatically trigger it when detected changes in repo - push: - branches: - [ main ] - paths: - - '**' - - '.github/workflows/ragpgpy1-rn5pyrt7ct-ca-AutoDeployTrigger-470b45d2-75dc-4f4f-bf14-dde901b82711.yml' - - # Allow manual trigger - workflow_dispatch: - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - permissions: - id-token: write #This is required for requesting the OIDC JWT Token - contents: read #Required when GH token is used to authenticate with private repo - - steps: - - name: Checkout to the branch - uses: actions/checkout@v2 - - - name: Azure Login - uses: azure/login@v1 - with: - client-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_TENANT_ID }} - subscription-id: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_AZURE_SUBSCRIPTION_ID }} - - - name: Build and push container image to registry - uses: azure/container-apps-deploy-action@v2 - with: - appSourcePath: ${{ github.workspace }} - _dockerfilePathKey_: _dockerfilePath_ - registryUrl: ragpgpy1rn5pyrt7ctpmaregistry.azurecr.io - registryUsername: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_REGISTRY_USERNAME }} - registryPassword: ${{ secrets.RAGPGPY1RN5PYRT7CTCA_REGISTRY_PASSWORD }} - containerAppName: ragpgpy1-rn5pyrt7ct-ca - resourceGroup: ResourceGroup1 - imageToBuild: ragpgpy1rn5pyrt7ctpmaregistry.azurecr.io/ragpgpy1-rn5pyrt7ct-ca:${{ github.sha }} - _buildArgumentsKey_: | - _buildArgumentsValues_ - - From 340fb51bc4b815cbf1755674e137fccac6d2d82f Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 21 Jan 2025 01:29:05 -0800 Subject: [PATCH 13/14] Create an auto-deploy file --- ...r-565cfea1-3928-4085-ae76-2b9ef89a591e.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml diff --git a/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml b/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml new file mode 100644 index 00000000..ef5365ee --- /dev/null +++ b/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml @@ -0,0 +1,48 @@ +name: Trigger auto deployment for ragpgpy22-mq5rtpyml-ca + +# When this action will be executed +on: + # Automatically trigger it when detected changes in repo + push: + branches: + [ main ] + paths: + - '**' + - '.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml' + + # Allow manual trigger + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + permissions: + id-token: write #This is required for requesting the OIDC JWT Token + contents: read #Required when GH token is used to authenticate with private repo + + steps: + - name: Checkout to the branch + uses: actions/checkout@v2 + + - name: Azure Login + uses: azure/login@v1 + with: + client-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_TENANT_ID }} + subscription-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_SUBSCRIPTION_ID }} + + - name: Build and push container image to registry + uses: azure/container-apps-deploy-action@v2 + with: + appSourcePath: ${{ github.workspace }} + _dockerfilePathKey_: _dockerfilePath_ + registryUrl: ragpgpy22mq5rtpymlxsggregistry.azurecr.io + registryUsername: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_REGISTRY_USERNAME }} + registryPassword: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_REGISTRY_PASSWORD }} + containerAppName: ragpgpy22-mq5rtpyml-ca + resourceGroup: ResourceGroup1 + imageToBuild: ragpgpy22mq5rtpymlxsggregistry.azurecr.io/ragpgpy22-mq5rtpyml-ca:${{ github.sha }} + _buildArgumentsKey_: | + _buildArgumentsValues_ + + From f330196600e645a070ba4c52d750a77fb8f5d7f8 Mon Sep 17 00:00:00 2001 From: Manjula Chintharla <84832942+ManjulaChintharla@users.noreply.github.com> Date: Tue, 21 Jan 2025 01:42:11 -0800 Subject: [PATCH 14/14] Unlink the containerApp ragpgpy22-mq5rtpyml-ca from this repo --- ...r-565cfea1-3928-4085-ae76-2b9ef89a591e.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml diff --git a/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml b/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml deleted file mode 100644 index ef5365ee..00000000 --- a/.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Trigger auto deployment for ragpgpy22-mq5rtpyml-ca - -# When this action will be executed -on: - # Automatically trigger it when detected changes in repo - push: - branches: - [ main ] - paths: - - '**' - - '.github/workflows/ragpgpy22-mq5rtpyml-ca-AutoDeployTrigger-565cfea1-3928-4085-ae76-2b9ef89a591e.yml' - - # Allow manual trigger - workflow_dispatch: - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - permissions: - id-token: write #This is required for requesting the OIDC JWT Token - contents: read #Required when GH token is used to authenticate with private repo - - steps: - - name: Checkout to the branch - uses: actions/checkout@v2 - - - name: Azure Login - uses: azure/login@v1 - with: - client-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_TENANT_ID }} - subscription-id: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_AZURE_SUBSCRIPTION_ID }} - - - name: Build and push container image to registry - uses: azure/container-apps-deploy-action@v2 - with: - appSourcePath: ${{ github.workspace }} - _dockerfilePathKey_: _dockerfilePath_ - registryUrl: ragpgpy22mq5rtpymlxsggregistry.azurecr.io - registryUsername: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_REGISTRY_USERNAME }} - registryPassword: ${{ secrets.RAGPGPY22MQ5RTPYMLCA_REGISTRY_PASSWORD }} - containerAppName: ragpgpy22-mq5rtpyml-ca - resourceGroup: ResourceGroup1 - imageToBuild: ragpgpy22mq5rtpymlxsggregistry.azurecr.io/ragpgpy22-mq5rtpyml-ca:${{ github.sha }} - _buildArgumentsKey_: | - _buildArgumentsValues_ - -