closes #80. Provide support for ACA and AKS deployment

Author: dantelmomsft

README.md

@@ -12,15 +12,15 @@ products:
 - active-directory
 - azure-cognitive-search
 - azure-app-service
-- aks
-- aca
+- azure-container-apps
+- azure-kubernetes-service
 - azure-sdks
 - github
 - document-intelligence
 - azure-monitor
 - azure-pipelines
 urlFragment: azure-search-openai-demo-java
-name: ChatGPT + Enterprise data (Java)
+name: ChatGPT + Enterprise data (Java) on App Service, Azure Container Apps, and Azure Kubernetes Service
 description: A Java sample app that chats with your data using OpenAI and AI Search.
 ---
 <!-- YAML front-matter schema: https://review.learn.microsoft.com/en-us/help/contribute/samples/process/onboarding?branch=main#supported-metadata-fields-for-readmemd -->

deploy/aks/azure.yaml

@@ -59,9 +59,19 @@ hooks:
       run: ./scripts/easyauth.ps1
       interactive: true
       continueOnError: false
+    posix:
+      shell: sh
+      run: ./scripts/easyauth.sh
+      interactive: true
+      continueOnError: false
   postdown:
     windows:
       shell: pwsh
       run: ./scripts/easyauth-down.ps1
       interactive: true
+      continueOnError: false
+    posix:
+      shell: sh
+      run: ./scripts/easyauth-down.sh
+      interactive: true
       continueOnError: false

docs/aca/README-ACA.md

@@ -28,21 +28,18 @@ For detailed instructions, see [Getting Started](#getting-started) below.
 ## Table of contents
 
 <!-- TOC -->
-
-* [Open this project](#open-this-project)
-* [Features](#features)
 * [Getting Started](#getting-started)
+  * [Run in GitHub Codespaces or VS Code Dev Containers](#run-in-github-codespaces-or-vs-code-dev-containers) 
   * [Prerequisites](#prerequisites)
   * [Starting from scratch](#starting-from-scratch)
   * [Deploying with existing Azure resources](#deploying-with-existing-azure-resources)
     * [Existing resource group](#existing-resource-group)
     * [Existing OpenAI resource](#existing-openai-resource)
-    * [Existing Azure Azure AI Search resource](#existing-azure-cognitive-search-resource)
+    * [Existing Azure Azure AI Search resource](#existing-azure-ai-search-resource)
     * [Other existing Azure resources](#other-existing-azure-resources)
     * [Provision remaining resources](#provision-remaining-resources)
-  * [Deploying again](#deploying-again)
+  * [Deploying again](#redeploying)
   * [Running locally](#running-locally)
-  * [To Run in GitHub Codespaces or VS Code Dev Containers](#to-run-in-github-codespaces-or-vs-code-dev-containers)
   * [UI Navigation](#ui-navigation)
 * [Enabling optional features](#enabling-optional-features)
   * [Enabling Application Insights](#enabling-application-insights)

docs/aks/README-AKS.md

@@ -22,21 +22,18 @@ For detailed instructions, see [Getting Started](#getting-started) below.
 ## Table of contents
 
 <!-- TOC -->
-
-- [Open this project](#open-this-project)
-- [Features](#features)
 - [Getting Started](#getting-started)
+  * [Run in GitHub Codespaces or VS Code Dev Containers](#run-in-github-codespaces-or-vs-code-dev-containers)
   - [Prerequisites](#prerequisites)
   - [Starting from scratch](#starting-from-scratch)
   - [Deploying with existing Azure resources](#deploying-with-existing-azure-resources)
     - [Existing resource group](#existing-resource-group)
     - [Existing OpenAI resource](#existing-openai-resource)
-    - [Existing Azure Azure AI Search resource](#existing-azure-cognitive-search-resource)
+    - [Existing Azure Azure AI Search resource](#existing-azure-ai-search-resource)
     - [Other existing Azure resources](#other-existing-azure-resources)
     - [Provision remaining resources](#provision-remaining-resources)
-  - [Deploying again](#deploying-again)
+  - [Deploying again](#redeploying)
   - [Running locally](#running-locally)
-  - [To Run in GitHub Codespaces or VS Code Dev Containers](#to-run-in-github-codespaces-or-vs-code-dev-containers)
   - [UI Navigation](#ui-navigation)
 - [Enabling optional features](#enabling-optional-features)
   - [Enabling Application Insights](#enabling-application-insights)
@@ -58,7 +55,7 @@ For detailed instructions, see [Getting Started](#getting-started) below.
 > **IMPORTANT:** In order to deploy and run this example, you'll need an **Azure subscription with access enabled for the Azure OpenAI Service**. You can request access [here](https://aka.ms/oaiapply). You can also visit [here](https://azure.microsoft.com/free/) to get some free Azure credits to get you started.
 
 > [!CAUTION]
-> At time of writing AZD has introduced a bug in AKS deployment since 1.6.1. version.Monitor this [issue](https://github.com/Azure/azure-dev/issues/3486) to check in which version it will be fixed. In the meantime consider to use azd 1.5.1 to run the aks deployment. You can download it from [here](https://github.com/Azure/azure-dev/releases/download/azure-dev-cli_1.5.1/azd-windows-amd64.msi) or visit the azd [release page](https://github.com/Azure/azure-dev/releases) to download specific os bundle 
+> Be sure to use AZD version > 1.7.0 
 
 ### Run in GitHub Codespaces or VS Code Dev Containers
 
@@ -73,7 +70,7 @@ All prerequisites are already installed in the container. You can skip to the [S
 
 - [Java 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
 - [Maven 3.8.x](https://maven.apache.org/download.cgi)
-- [Azure Developer CLI](https://aka.ms/azure-dev/install)
+- [Azure Developer CLI 1.7.0](https://aka.ms/azure-dev/install)
 - [Node.js](https://nodejs.org/en/download/)
 - [Git](https://git-scm.com/downloads)
 - [Powershell 7+ (pwsh)](https://github.com/powershell/powershell) - For Windows users only.
@@ -108,11 +105,11 @@ Once you have the project available locally, run the following commands if you d
    - This will provision Azure resources and deploy this sample to those resources, including building the search index based on the files found in the `./data` folder.
    - For the target location, the regions that currently support the models used in this sample are **East US**, **France Central**, **South Central US**, **UK South**, and **West Europe**. For an up-to-date list of regions and models, check [here](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models)
 
-3. After the application has been successfully deployed you will see a frontend app URL printed to the console. Click that URL to interact with the application in your browser.
+3. After the application has been successfully deployed you will see a backend app load balancer IP printed to the console. Click that URL to interact with the application in your browser.
 
 It will look like the following:
 
-!['Output from running azd up'](docs/endpoint.png)
+!['Output from running azd up'](aks-deploy-success.png)
 
 > NOTE: It may take a minute for the application to be fully deployed.
 
@@ -246,7 +243,7 @@ To see the performance data, go to the Application Insights resource in your res
 To inspect the performance of chat requests, use the "Drill into Samples" button to see end-to-end traces of all the API calls made for any chat request.
 Under "Trace & Events" panel you can review custom Java informational logs to better understand content of OpenAI requests and responses.
 
-![Tracing screenshot](docs/transaction-tracing.png)
+![Tracing screenshot](aks-transaction-tracing.png)
 
 To see any exceptions and server errors, navigate to the "Investigate -> Failures" blade and use the filtering tools to locate a specific exception. You can see Java stack traces on the right-hand side.
 

docs/aks/aks-deploy-success.png

@@ -23,19 +23,18 @@ For detailed instructions, see [Getting Started](#getting-started) below.
 
 <!-- TOC -->
 
-* [Open this project](#open-this-project)
 * [Getting Started](#getting-started)
+  * [Run in GitHub Codespaces or VS Code Dev Containers](#run-in-github-codespaces-or-vs-code-dev-containers)
   * [Prerequisites](#prerequisites)
   * [Starting from scratch](#starting-from-scratch)
   * [Deploying with existing Azure resources](#deploying-with-existing-azure-resources)
     * [Existing resource group](#existing-resource-group)
     * [Existing OpenAI resource](#existing-openai-resource)
-    * [Existing Azure Azure AI Search resource](#existing-azure-cognitive-search-resource)
+    * [Existing Azure Azure AI Search resource](#existing-azure-ai-search-resource)
     * [Other existing Azure resources](#other-existing-azure-resources)
     * [Provision remaining resources](#provision-remaining-resources)
-  * [Deploying again](#deploying-again)
+  * [Deploying again](#redeploying)
   * [Running locally](#running-locally)
-  * [To Run in GitHub Codespaces or VS Code Dev Containers](#to-run-in-github-codespaces-or-vs-code-dev-containers)
   * [UI Navigation](#ui-navigation)
 * [Enabling optional features](#enabling-optional-features)
   * [Enabling Application Insights](#enabling-application-insights)
@@ -141,7 +140,7 @@ You can also use existing Form Recognizer and Storage Accounts. See `./infra/mai
 
 #### Provision remaining resources
 
-Now you can run `azd up`, following the steps in [Deploying from scratch](#deploying-from-scratch) above.
+Now you can run `azd up`, following the steps in [Starting from scratch](#starting-from-scratch) above.
 That will both provision resources and deploy the code.
 
 
@@ -280,7 +279,7 @@ Once saved, you will see dev and prod environment got automatically created unde
 
 Connect Azure Devops to Azure:
 1. Add a Service Connection following this [guide](https://learn.microsoft.com/en-us/azure/devops/pipelines/library/connect-to-azure?view=azure-devops) to allow Azure Devops pipeline to connect to your Azure resources /App Service.
-2. Modify `.azdo/pipelines/app-ci.yaml` '<azureSubscriptionServiceConnection>' and replace it with the name of the Service Connection.
+2. Modify `.azdo/pipelines/app-ci.yaml` '&lt;azureSubscriptionServiceConnection&gt;' and replace it with the name of the Service Connection.
 ![location1](pipeline-azure-service-connection1.png)
 ![location2](pipeline-azure-service-connection2.png)