From 50002819e2199370a924db37772adc7cdb5cfcdc Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:41:16 +0530 Subject: [PATCH 01/11] Update frontend.yaml --- kubernetes/frontend.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml index 7267eb2..ca68ab6 100644 --- a/kubernetes/frontend.yaml +++ b/kubernetes/frontend.yaml @@ -30,9 +30,8 @@ metadata: spec: selector: app: frontend - type: NodePort + type: LoadBalancer ports: - port: 5173 targetPort: 5173 protocol: TCP - nodePort: 31000 From b3bab0273909d29284712951066cd426cacadf40 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:41:40 +0530 Subject: [PATCH 02/11] Update backend.yaml --- kubernetes/backend.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml index 6c3b7a2..9c607e0 100644 --- a/kubernetes/backend.yaml +++ b/kubernetes/backend.yaml @@ -28,11 +28,11 @@ metadata: name: backend-service namespace: wanderlust spec: - type: NodePort + type: LoadBalancer selector: app: backend ports: - port: 8080 targetPort: 8080 protocol: TCP - nodePort: 31100 + From 2102a55488a7d99c0a13bbf26c01a42fb3e47d3e Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:51:36 +0530 Subject: [PATCH 03/11] Update deployDev.yml --- .github/workflows/deployDev.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index 3fb24ca..a4cf110 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -23,21 +23,21 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push Docker image - run: | - docker build -t hellopradum/backend-wanderlust backend/. - docker build -t hellopradum/frontend-wanderlust frontend/. + # - name: Build and push Docker image + # run: | + # docker build -t hellopradum/backend-wanderlust backend/. + # docker build -t hellopradum/frontend-wanderlust frontend/. - docker push hellopradum/backend-wanderlust:latest - docker push hellopradum/frontend-wanderlust:latest + # docker push hellopradum/backend-wanderlust:latest + # docker push hellopradum/frontend-wanderlust:latest - name: Update kubeconfig run: aws eks update-kubeconfig --name demo-ekscluster - - name: Create and claim persistent volume - run: | - kubectl apply -f kubernetes/persistentVolume.yaml - kubectl apply -f kubernetes/persistentVolumeClaim.yaml + # - name: Create and claim persistent volume + # run: | + # kubectl apply -f kubernetes/persistentVolume.yaml + # kubectl apply -f kubernetes/persistentVolumeClaim.yaml - name: Deploy MongoDB run: | From a363232bba0f560911543b50802b02c68a6b3fa4 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:20:52 +0530 Subject: [PATCH 04/11] Update deployDev.yml --- .github/workflows/deployDev.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index a4cf110..30b394c 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -23,16 +23,16 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - # - name: Build and push Docker image - # run: | - # docker build -t hellopradum/backend-wanderlust backend/. - # docker build -t hellopradum/frontend-wanderlust frontend/. + - name: Build and push Docker image + run: | + docker build -t hellopradum/backend-wanderlust backend/. + docker build -t hellopradum/frontend-wanderlust frontend/. - # docker push hellopradum/backend-wanderlust:latest - # docker push hellopradum/frontend-wanderlust:latest + docker push hellopradum/backend-wanderlust:latest + docker push hellopradum/frontend-wanderlust:latest - name: Update kubeconfig - run: aws eks update-kubeconfig --name demo-ekscluster + run: aws eks update-kubeconfig --name wanderlust-ekscluster # - name: Create and claim persistent volume # run: | From aabea0d41f96060838818a1aa740295bd4826deb Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:56:46 +0530 Subject: [PATCH 05/11] Update deployDev.yml --- .github/workflows/deployDev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index 30b394c..d3ef5ee 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -32,7 +32,7 @@ jobs: docker push hellopradum/frontend-wanderlust:latest - name: Update kubeconfig - run: aws eks update-kubeconfig --name wanderlust-ekscluster + run: aws eks update-kubeconfig --name wanderlust-ekscluster1 # - name: Create and claim persistent volume # run: | From 3cc883f033c218b5e6ba0a1873712ee6abbcf3d4 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:11:38 +0530 Subject: [PATCH 06/11] Update deployDev.yml --- .github/workflows/deployDev.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index d3ef5ee..433007f 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -23,21 +23,21 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push Docker image - run: | - docker build -t hellopradum/backend-wanderlust backend/. - docker build -t hellopradum/frontend-wanderlust frontend/. + # - name: Build and push Docker image + # run: | + # docker build -t hellopradum/backend-wanderlust backend/. + # docker build -t hellopradum/frontend-wanderlust frontend/. - docker push hellopradum/backend-wanderlust:latest - docker push hellopradum/frontend-wanderlust:latest + # docker push hellopradum/backend-wanderlust:latest + # docker push hellopradum/frontend-wanderlust:latest - name: Update kubeconfig run: aws eks update-kubeconfig --name wanderlust-ekscluster1 - # - name: Create and claim persistent volume - # run: | - # kubectl apply -f kubernetes/persistentVolume.yaml - # kubectl apply -f kubernetes/persistentVolumeClaim.yaml + - name: Create and claim persistent volume + run: | + kubectl apply -f kubernetes/persistentVolume.yaml + kubectl apply -f kubernetes/persistentVolumeClaim.yaml - name: Deploy MongoDB run: | From 777d8642d8ef850b3e338ca06ab3d887a7eedf3f Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:16:55 +0530 Subject: [PATCH 07/11] Update .env.docker --- frontend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.docker b/frontend/.env.docker index 9bf0489..f1b9692 100644 --- a/frontend/.env.docker +++ b/frontend/.env.docker @@ -1,2 +1,2 @@ -VITE_API_PATH=107.21.89.1:31100 +VITE_API_PATH=10.100.137.125:31713 From 9a4c344f03be1d68caf4b42748a896b1671dd3f1 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:18:03 +0530 Subject: [PATCH 08/11] Update .env.docker --- backend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.env.docker b/backend/.env.docker index f4b0474..a300784 100644 --- a/backend/.env.docker +++ b/backend/.env.docker @@ -1,7 +1,7 @@ MONGODB_URI="mongodb://mongo-service/wanderlust" REDIS_URL="redis://redis-service:6379" PORT=8080 -FRONTEND_URL="http://107.21.89.1:5173" +FRONTEND_URL="http://10.100.109.254:5173" ACCESS_COOKIE_MAXAGE=120000 ACCESS_TOKEN_EXPIRES_IN='120s' REFRESH_COOKIE_MAXAGE=120000 From 51004e4a88c25eca6405b8748d01ab789763dcaf Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:18:25 +0530 Subject: [PATCH 09/11] Update deployDev.yml --- .github/workflows/deployDev.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index 433007f..b2f76fd 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -23,13 +23,13 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - # - name: Build and push Docker image - # run: | - # docker build -t hellopradum/backend-wanderlust backend/. - # docker build -t hellopradum/frontend-wanderlust frontend/. + - name: Build and push Docker image + run: | + docker build -t hellopradum/backend-wanderlust backend/. + docker build -t hellopradum/frontend-wanderlust frontend/. - # docker push hellopradum/backend-wanderlust:latest - # docker push hellopradum/frontend-wanderlust:latest + docker push hellopradum/backend-wanderlust:latest + docker push hellopradum/frontend-wanderlust:latest - name: Update kubeconfig run: aws eks update-kubeconfig --name wanderlust-ekscluster1 From 313a0a7d7cf7373612305498110adbfebef5cd08 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:54:55 +0530 Subject: [PATCH 10/11] Update .env.docker --- frontend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.docker b/frontend/.env.docker index f1b9692..e1aa2ed 100644 --- a/frontend/.env.docker +++ b/frontend/.env.docker @@ -1,2 +1,2 @@ -VITE_API_PATH=10.100.137.125:31713 +VITE_API_PATH=http://abb27d3603d12453aa2f7d7348531cc4-159321458.us-east-1.elb.amazonaws.com:30766 From 1328d9e291182fcac6206edebce4168a0773a643 Mon Sep 17 00:00:00 2001 From: Pradum Chintamani <80237284+pradumchintamani@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:55:49 +0530 Subject: [PATCH 11/11] Update .env.docker --- backend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.env.docker b/backend/.env.docker index a300784..891baa9 100644 --- a/backend/.env.docker +++ b/backend/.env.docker @@ -1,7 +1,7 @@ MONGODB_URI="mongodb://mongo-service/wanderlust" REDIS_URL="redis://redis-service:6379" PORT=8080 -FRONTEND_URL="http://10.100.109.254:5173" +FRONTEND_URL="http://a0b8b9e24617a43af955a7f3ad04005c-180821507.us-east-1.elb.amazonaws.com:5173" ACCESS_COOKIE_MAXAGE=120000 ACCESS_TOKEN_EXPIRES_IN='120s' REFRESH_COOKIE_MAXAGE=120000