Skip to content

Commit e5b58fd

Browse files
authored
Revert "Implement GenAI functionality and testing"
1 parent 5f436a7 commit e5b58fd

File tree

23 files changed

+78
-549
lines changed

23 files changed

+78
-549
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,14 @@ jobs:
2626

2727
# TODO Add linting
2828

29-
# Run Java unit tests
29+
# Run Java unit-tests
3030
unit_tests:
3131
name: Run Tests
3232
uses: ./.github/workflows/java_tests.yml
3333
needs: update_api_spec
3434

35-
# Run GenAI module tests
36-
genai_tests:
37-
name: Run GenAI Tests
38-
uses: ./.github/workflows/genai_tests.yml
39-
needs: update_api_spec
40-
secrets:
41-
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
42-
4335
# Run UI tests (unit, integration, and e2e)
36+
4437
ui_tests:
4538
name: Run UI Tests
4639
uses: ./.github/workflows/ui_tests.yml

.github/workflows/genai_tests.yml

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

deployment/README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ The `deployment` directory contains necessary files for the deployment of Meet@M
44
To deploy the system manually on your local machine, follow the guides below. Automated deployment workflows in GitHub Actions can be found under `../.github/workflows`.
55

66
## Docker Compose
7-
Prerequisites:
8-
- a `.env` file is located in `/docker` directory and contains the `OPENAI_API_KEY` secret for the GenAI service (in AWS deployment, a GitHub secret is used instead)
9-
107
Use the following commands to start / stop / inspect the project using Docker Compose:
118
```
129
cd docker # Move to docker directory
@@ -29,12 +26,6 @@ kubectl create secret generic <match/user>-db-secret \
2926
--from-literal=MYSQL_ROOT_PASSWORD='<your-password>' \
3027
--namespace devoops
3128
```
32-
- OpenAI API key is saved as secret in the `devoops` namespace:
33-
```
34-
kubectl create secret generic genai-secret \
35-
--from-literal=OPENAI_API_KEY=sk-... \
36-
--namespace devoops
37-
```
3829

3930
Once the three requirements are fulfilled, you can run the application:
4031
```

deployment/compose.aws.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ services:
9898

9999
meetatmensa-genai:
100100
image: ghcr.io/aet-devops25/team-devoops/genai:latest
101-
environment:
102-
OPENAI_API_KEY: ${OPENAI_API_KEY}
103101
container_name: meetatmensa-genai
104102
labels:
105103
- traefik.enable=true

deployment/docker/compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ services:
4141
- "80"
4242
networks:
4343
- backend
44-
env_file:
45-
- .env
4644

4745
meetatmensa-client:
4846
build:

deployment/k8s/charts/genai/templates/deployment.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ spec:
4040
{{- end }}
4141
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4242
imagePullPolicy: {{ .Values.image.pullPolicy }}
43-
env:
44-
- name: OPENAI_API_KEY
45-
valueFrom:
46-
secretKeyRef:
47-
name: genai-secret
48-
key: OPENAI_API_KEY
4943
ports:
5044
- name: http
5145
containerPort: {{ .Values.service.port }}

infrastructure/ansible/playbooks/deploy.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,4 @@
105105
remove_orphans: yes
106106
environment:
107107
DOCKER_BUILDKIT: 1
108-
EC2_PUBLIC_IP: "{{ ansible_host }}"
109-
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
108+
EC2_PUBLIC_IP: "{{ ansible_host }}"
-42.7 KB
Binary file not shown.
-42.7 KB
Binary file not shown.

server/gateway/src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ spring:
4141
- id: genai_route
4242
uri: http://meetatmensa-genai:80
4343
predicates:
44-
- Path=/api/v2/genai/**
44+
- Path=/genai/**

0 commit comments

Comments
 (0)