Skip to content

Commit b48db50

Browse files
dminkovskidminkovski
committed
All running on aks and indexer script working.
1 parent dac3b7b commit b48db50

24 files changed

+118
-391
lines changed

‎app/backend/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
2525
RUN curl -LJ -o /app/applicationinsights-agent-3.4.19.jar https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.19/applicationinsights-agent-3.4.19.jar
2626
COPY applicationinsights.json /app
2727

28+
EXPOSE 8080
29+
2830
ENTRYPOINT ["java","-javaagent:/app/applicationinsights-agent-3.4.19.jar","-noverify", "-XX:MaxRAMPercentage=70", "-XX:+UseParallelGC", "-XX:ActiveProcessorCount=2", "-cp","app:app/lib/*","com.microsoft.openai.samples.rag.Application"]

‎app/backend/manifests/azd-env-configmap.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,46 @@
1+
# Updated 2024-02-07 15:59:54
12
apiVersion: v1
23
kind: ConfigMap
34
metadata:
45
name: azd-env-configmap
56
data:
67
API_ALLOW_ORIGINS: ""
7-
APPLICATIONINSIGHTS_CONNECTION_STRING: "InstrumentationKey=00b3d5c0-8589-4537-896a-64903b3b37d5;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/"
8-
AZURE_AKS_CLUSTER_NAME: "aks-z7nmzhah37yks"
9-
AZURE_CLIENT_ID: "7c00ccda-34ed-455a-9977-f509fa0293a2"
10-
AZURE_CONTAINER_REGISTRY_ENDPOINT: "crz7nmzhah37yks.azurecr.io"
11-
AZURE_CONTAINER_REGISTRY_NAME: "crz7nmzhah37yks"
12-
AZURE_ENV_NAME: "azure-search-openai-demo-aks"
13-
AZURE_FORMRECOGNIZER_RESOURCE_GROUP: "rg-azure-search-openai-demo-aks"
14-
AZURE_FORMRECOGNIZER_SERVICE: "cog-fr-z7nmzhah37yks"
15-
AZURE_KEY_VAULT_ENDPOINT: "https://kv-z7nmzhah37yks.vault.azure.net/"
8+
APPLICATIONINSIGHTS_CONNECTION_STRING: "InstrumentationKey=50620f11-1bce-47ef-b73e-d09167e57948;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/"
9+
AZURE_AKS_CLUSTER_NAME: "aks-jqff3e43olgb2"
10+
AZURE_CLIENT_ID: "0f9806da-faba-4987-8ca1-2fce113cbc67"
11+
AZURE_CONTAINER_REGISTRY_ENDPOINT: "crjqff3e43olgb2.azurecr.io"
12+
AZURE_CONTAINER_REGISTRY_NAME: "crjqff3e43olgb2"
13+
AZURE_ENV_NAME: "aks-env"
14+
AZURE_FORMRECOGNIZER_RESOURCE_GROUP: "rg-aks-env"
15+
AZURE_FORMRECOGNIZER_SERVICE: "cog-fr-jqff3e43olgb2"
16+
AZURE_KEY_VAULT_ENDPOINT: "https://kv-jqff3e43olgb2.vault.azure.net/"
1617
AZURE_LOCATION: "westeurope"
1718
AZURE_OPENAI_CHATGPT_DEPLOYMENT: "chat"
1819
AZURE_OPENAI_CHATGPT_MODEL: "gpt-35-turbo"
1920
AZURE_OPENAI_EMB_DEPLOYMENT: "embedding"
2021
AZURE_OPENAI_EMB_MODEL_NAME: "text-embedding-ada-002"
21-
AZURE_OPENAI_RESOURCE_GROUP: "rg-azure-search-openai-demo-aks"
22-
AZURE_OPENAI_SERVICE: "cog-z7nmzhah37yks"
23-
AZURE_RESOURCE_GROUP: "rg-azure-search-openai-demo-aks"
22+
AZURE_OPENAI_RESOURCE_GROUP: "rg-aks-env"
23+
AZURE_OPENAI_SERVICE: "cog-jqff3e43olgb2"
24+
AZURE_RESOURCE_GROUP: "rg-aks-env"
2425
AZURE_SEARCH_INDEX: "gptkbindex"
25-
AZURE_SEARCH_SERVICE: "gptkb-z7nmzhah37yks"
26-
AZURE_SEARCH_SERVICE_RESOURCE_GROUP: "rg-azure-search-openai-demo-aks"
27-
AZURE_SERVICEBUS_NAMESPACE: "sb-z7nmzhah37yks"
26+
AZURE_SEARCH_SERVICE: "gptkb-jqff3e43olgb2"
27+
AZURE_SEARCH_SERVICE_RESOURCE_GROUP: "rg-aks-env"
28+
AZURE_SERVICEBUS_NAMESPACE: "sb-jqff3e43olgb2"
2829
AZURE_SERVICEBUS_SKU_NAME: "Standard"
29-
AZURE_STORAGE_ACCOUNT: "stz7nmzhah37yks"
30+
AZURE_STORAGE_ACCOUNT: "stjqff3e43olgb2"
3031
AZURE_STORAGE_CONTAINER: "content"
31-
AZURE_STORAGE_RESOURCE_GROUP: "rg-azure-search-openai-demo-aks"
32+
AZURE_STORAGE_RESOURCE_GROUP: "rg-aks-env"
3233
AZURE_SUBSCRIPTION_ID: "c154355a-25c1-4d2b-9b32-c312d07cb558"
3334
AZURE_TENANT_ID: "16b3c013-d300-468d-ac64-7eda0820b6d3"
3435
OPENAI_API_KEY: ""
3536
OPENAI_HOST: "azure"
3637
OPENAI_ORGANIZATION: ""
37-
REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING: "InstrumentationKey=00b3d5c0-8589-4537-896a-64903b3b37d5;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/"
38-
SERVICE_API_ENDPOINT_URL: "http://40.119.157.31/api"
39-
SERVICE_API_IMAGE_NAME: "crz7nmzhah37yks.azurecr.io/azure-search-openai-demo/api-azure-search-openai-demo-aks:azd-deploy-1706893758"
40-
SERVICE_INDEXER_ENDPOINT_URL: "http://10.0.14.238:80"
41-
SERVICE_INDEXER_IMAGE_NAME: "crz7nmzhah37yks.azurecr.io/azure-search-openai-demo/indexer-azure-search-openai-demo-aks:azd-deploy-1706893760"
42-
SERVICE_WEB_IMAGE_NAME: "crz7nmzhah37yks.azurecr.io/azure-search-openai-demo/web-azure-search-openai-demo-aks:azd-deploy-1706893434"
38+
REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING: "InstrumentationKey=50620f11-1bce-47ef-b73e-d09167e57948;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/"
39+
SERVICE_API_ENDPOINT_URL: "http://20.103.144.127"
40+
SERVICE_API_IMAGE_NAME: "crjqff3e43olgb2.azurecr.io/azure-search-openai-demo/api-aks-env:azd-deploy-1707317570"
41+
SERVICE_FRONTEND_ENDPOINT_URL: "http://10.0.7.174:80"
42+
SERVICE_FRONTEND_IMAGE_NAME: "crjqff3e43olgb2.azurecr.io/azure-search-openai-demo/frontend-aks-env:azd-deploy-1707317583"
43+
SERVICE_INDEXER_ENDPOINT_URL: "http://10.0.90.221:80"
44+
SERVICE_INDEXER_IMAGE_NAME: "crjqff3e43olgb2.azurecr.io/azure-search-openai-demo/indexer-aks-env:azd-deploy-1707317587"
45+
SERVICE_WEB_IMAGE_NAME: "crjqff3e43olgb2.azurecr.io/azure-search-openai-demo/web-aks-env:azd-deploy-1707296261"
4346

‎app/backend/manifests/backend.tmpl renamed to ‎app/backend/manifests/backend-deployment.tmpl.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: backend-deployment
5+
namespace: azure-open-ai
56
labels:
67
app: backend
78
spec:
@@ -16,7 +17,7 @@ spec:
1617
spec:
1718
containers:
1819
- name: backend
19-
image: { { .Env.SERVICE_API_IMAGE_NAME } }
20+
image: {{.Env.SERVICE_API_IMAGE_NAME}}
2021
imagePullPolicy: IfNotPresent
2122
ports:
2223
- containerPort: 8080

‎app/backend/manifests/backend-deployment.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎app/backend/manifests/backend-service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
name: backend-service
5-
namespace: default
5+
namespace: azure-open-ai
66
spec:
77
type: ClusterIP
88
ports:

‎app/backend/manifests/ingress.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@ apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: ingress-api
5-
namespace: default
6-
annotations:
7-
nginx.ingress.kubernetes.io/use-regex: "true"
8-
nginx.ingress.kubernetes.io/rewrite-target: /$2
5+
namespace: azure-open-ai
6+
# annotations:
7+
# nginx.ingress.kubernetes.io/use-regex: "true"
8+
# nginx.ingress.kubernetes.io/rewrite-target: /$2
99
spec:
1010
ingressClassName: webapprouting.kubernetes.azure.com
1111
rules:
1212
- http:
1313
paths:
14-
#- path: /api(/|$)(.*)
15-
# pathType: Prefix
16-
# backend:
17-
# service:
18-
# name: backend-service
19-
# port:
20-
# number: 80
2114
- path: /
2215
pathType: Prefix
2316
backend:

‎app/frontend/manifests/frontend-deployment.tmpl.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: frontend-deployment
5+
namespace: azure-open-ai
6+
labels:
7+
app: frontend
8+
spec:
9+
replicas: 1
10+
selector:
11+
matchLabels:
12+
app: frontend
13+
template:
14+
metadata:
15+
labels:
16+
app: frontend
17+
spec:
18+
containers:
19+
- name: frontend
20+
image: {{.Env.SERVICE_FRONTEND_IMAGE_NAME}}
21+
imagePullPolicy: IfNotPresent
22+
ports:
23+
- containerPort: 80
24+
envFrom:
25+
- configMapRef:
26+
name: azd-env-configmap
27+
env:
28+
- name: REACT_APP_API_BASE_URL
29+
value: "http://backend-service"

‎app/frontend/manifests/frontend-deployment.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎app/frontend/manifests/frontend-service.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: frontend-service
5-
namespace: default
4+
name: frontend-service
5+
namespace: azure-open-ai
66
spec:
7-
type: ClusterIP
8-
ports:
9-
- protocol: TCP
10-
port: 80
11-
targetPort: 80
12-
selector:
13-
app: frontend
7+
type: ClusterIP
8+
ports:
9+
- protocol: TCP
10+
port: 80
11+
targetPort: 80
12+
selector:
13+
app: frontend

‎app/frontend/manifests/frontend.tmpl

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)