Skip to content

Commit

Permalink
Merge pull request #154 from ghkdqhrbals/test/only-chat
Browse files Browse the repository at this point in the history
Test/only chat
  • Loading branch information
ghkdqhrbals authored Nov 16, 2023
2 parents 0b9e778 + 2abddee commit 6de97a0
Show file tree
Hide file tree
Showing 38 changed files with 405 additions and 437 deletions.
136 changes: 0 additions & 136 deletions .github/workflows/chat-only.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
run: ./gradlew build --daemon --parallel -Pversion=${NEW_VERSION}

- name: Build docker images
run: docker-compose -f docker-compose-only-chat.yaml build
run: docker-compose -f docker-compose-prod.yaml build

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
git reset --hard
git pull origin main
cd k8s/onlychat/deployment
sh write_image_to_deploy.sh ${{ env.ECR_URL }} ap-northeast-2 ${NEW_VERSION}
sh write_image_to_deploy.sh ${{ env.ECR_URL }} ap-east-2 ${NEW_VERSION}
kubectl apply -f ./volume/
kubectl apply -f ./namespace/
kubectl apply -f ./service/
Expand Down
57 changes: 0 additions & 57 deletions k8s/all/deploy/chat-db-deployment.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions k8s/all/deploy/discovery-server-deployment.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions k8s/all/deploy/zookeeper-deployment.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions k8s/all/service/discovery-server-service.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions k8s/all/service/kafka1-service.yaml

This file was deleted.

33 changes: 33 additions & 0 deletions k8s/onlychat/deployment/api-server-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: api-server-deployment
spec:
replicas: 1
selector:
matchLabels:
app: api-server-service
template:
metadata:
labels:
app: api-server
spec:
containers:
- env:
- name: SERVER_PORT
value: "8000"
- name: SPRING_CLOUD_CONFIG_URI
value: http://43.202.52.177:8888
- name: SPRING_MAIN_web-application-type
value: reactive
- name: SPRING_RABBITMQ_HOST
value: rabbitmq
- name: eureka_client_service-url_defaultZone
value: http://discovery-server-service:8761/eureka
image: main-service_api-server:latest
name: api-server
ports:
- port: 8000
targetPort: 8000
protocol: TCP
restartPolicy: Always
11 changes: 3 additions & 8 deletions k8s/onlychat/deployment/chat-db-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: chat-db
name: chat-db-deployment
namespace: default
spec:
replicas: 1
selector:
matchLabels:
app: chat-db
strategy:
type: Recreate
template:
metadata:
labels:
Expand All @@ -37,10 +32,10 @@ spec:
hostPort: 5433
protocol: TCP
volumeMounts:
- name: pgdata-chat
- name: chat-vol
mountPath: /var/lib/postgresql/data
restartPolicy: Always
volumes:
- name: pgdata-chat
- name: chat-vol
persistentVolumeClaim:
claimName: pgdata-chat
claimName: chat-pvc
Loading

0 comments on commit 6de97a0

Please sign in to comment.