diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 48d15c5..4d20d24 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -187,10 +187,6 @@ jobs: sed -i "s|image: ghcr.io/kunal-511/beatwave:.*|image: ghcr.io/kunal-511/beatwave:$VERSION|g" k8s/frontend-deployment.yml echo "Updated manifests with version: $VERSION" - - name: Validate Kubernetes manifests - run: | - kubectl apply --dry-run=client -f k8s/backend-deployment.yml - kubectl apply --dry-run=client -f k8s/frontend-deployment.yml - name: Commit updated manifests run: | diff --git a/frontend/src/lib/axios.ts b/frontend/src/lib/axios.ts index 60c45a5..ef220fe 100644 --- a/frontend/src/lib/axios.ts +++ b/frontend/src/lib/axios.ts @@ -1,5 +1,5 @@ import axios from "axios"; export const axiosInstance = axios.create({ - baseURL: import.meta.env.MODE === "development" ? "http://localhost:5000/api" : "/api", + baseURL: import.meta.env.VITE_API_URL || (import.meta.env.MODE === "development" ? "http://localhost:5000/api" : "/api"), }); diff --git a/k8s/backend-deployment.yml b/k8s/backend-deployment.yml index 6d612c4..2ffd936 100644 --- a/k8s/backend-deployment.yml +++ b/k8s/backend-deployment.yml @@ -19,7 +19,7 @@ spec: spec: containers: - name: beatwave-backend - image: ghcr.io/kunal-511/beatwave-backend:v2 + image: ghcr.io/kunal-511/beatwave-backend:v0.0.1 ports: - containerPort: 5000 env: @@ -40,6 +40,16 @@ spec: configMapKeyRef: name: backend-port key: NODE_ENV + - name: REDIS_HOST + valueFrom: + configMapKeyRef: + name: backend-port + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + configMapKeyRef: + name: backend-port + key: REDIS_PORT - name: MONGODB_URI valueFrom: diff --git a/k8s/configmaps.yml b/k8s/configmaps.yml index 8447e4d..cf0846e 100644 --- a/k8s/configmaps.yml +++ b/k8s/configmaps.yml @@ -7,3 +7,5 @@ data: PORT: "5000" ADMIN_EMAIL: "yoyokvunal@gmail.com" NODE_ENV: "development" + REDIS_HOST: "redis" + REDIS_PORT: "6379" diff --git a/k8s/frontend-deployment.yml b/k8s/frontend-deployment.yml index 5ceffae..101f2d7 100644 --- a/k8s/frontend-deployment.yml +++ b/k8s/frontend-deployment.yml @@ -17,12 +17,15 @@ spec: spec: containers: - name: beatwave-frontend - image: ghcr.io/kunal-511/beatwave:v2 + image: ghcr.io/kunal-511/beatwave:v0.0.1 ports: - - containerPort: 3000 + - containerPort: 80 env: - name: VITE_CLERK_PUBLISHABLE_KEY valueFrom: secretKeyRef: name: backend-secrets key: VITE_CLERK_PUBLISHABLE_KEY + + - name: VITE_API_URL + value: "http://backend:5000/api" diff --git a/k8s/frontend-service.yml b/k8s/frontend-service.yml index 737c8b5..c2a18ed 100644 --- a/k8s/frontend-service.yml +++ b/k8s/frontend-service.yml @@ -8,4 +8,4 @@ spec: app: frontend ports: - port: 3000 - targetPort: 3000 + targetPort: 80 diff --git a/k8s/redis-deployment.yaml b/k8s/redis-deployment.yaml index a652351..cba06d1 100644 --- a/k8s/redis-deployment.yaml +++ b/k8s/redis-deployment.yaml @@ -18,4 +18,4 @@ spec: image: redis:7.2-alpine ports: - containerPort: 6379 - commands: ["redis-server", "--appendonly", "yes"] + command: ["redis-server", "--appendonly", "yes"] diff --git a/k8s/redis-service.yaml b/k8s/redis-service.yaml index 8d2b9e9..2143048 100644 --- a/k8s/redis-service.yaml +++ b/k8s/redis-service.yaml @@ -1,5 +1,5 @@ -apiVersion: apps/v1 -kind:: Service +apiVersion: v1 +kind: Service metadata: name: redis namespace: beatwave