remvoed the calendar deployment

.github/workflows/server-cicd.yml

@@ -69,21 +69,3 @@ jobs:
       deployment: feedback
     secrets:
       ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
-  calendar-deployment:
-    uses: ./.github/workflows/_restart-argocd.yml
-    if: ${{ github.ref }} == 'refs/heads/main'
-    needs:
-      - server-build
-    with:
-      deployment: calendar
-    secrets:
-      ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
-  server-deployment:
-    uses: ./.github/workflows/_restart-argocd.yml
-    if: ${{ github.ref }} == 'refs/heads/main'
-    needs:
-      - server-build
-    with:
-      deployment: server
-    secrets:
-      ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}

deployment/k3s/templates/deployments/webclient-deployment.yaml

@@ -41,8 +41,6 @@ spec:
               value: http://api-svc.navigatum.svc.cluster.local:3003
             - name: FEEDBACK_API_URL
               value: http://feedback-svc.navigatum.svc.cluster.local:3004
-            - name: CALENDAR_API_URL
-              value: http://calendar-svc.navigatum.svc.cluster.local:3005
           resources:
             requests:
               cpu: 5m

docker-compose.yml

@@ -10,7 +10,6 @@ services:
       CDN_URL: http://data:3002
       MAIN_API_URL: http://main-api:3003
       FEEDBACK_API_URL: http://feedback-api:3004
-      CALENDAR_API_URL: http://calendar-api:3005
     depends_on:
       tileserver:
         condition: service_healthy
@@ -112,25 +111,6 @@ services:
       test: wget -q --spider http://localhost:3004/api/feedback/status
       retries: 5
       start_period: 10s
-  calendar-api:
-    image: ghcr.io/tum-dev/navigatum-server:latest
-    restart: always
-    build: ./server
-    command: /bin/navigatum-calendar
-    environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_URL: db:5432
-    depends_on:
-      db:
-        condition: service_healthy
-    ports:
-      - "3005:3005"
-    healthcheck:
-      test: wget -q --spider http://localhost:3005/api/calendar/status
-      retries: 5
-      start_period: 10s
   db:
     image: postgres:16
     restart: unless-stopped

server/README.md

@@ -3,10 +3,6 @@
 Our server is architected in different microservices, each of which is responsible for a specific task.
 
 - [main-api](/server/main-api): The main API server, which serves the API endpoints
-- [calendar](/server/calendar): The calendar microservice, which scrapes and serves calendar data  
-  This is separated from the server because:
-  - it has virtually no shared dependencies (natural fault line)
-  - we need a persistent database (postgres) for this microservice, but not for the main server (sqlite)
 - [feedback](/server/feedback): The feedback microservice, which allows users to submit feedback  
   This is separated from the server because:
   - it has virtually no shared dependencies (natural faultline)

webclient/Dockerfile

@@ -19,4 +19,4 @@ COPY --from=build-stage /dist /app
 
 EXPOSE 3000
 HEALTHCHECK CMD curl --fail localhost:3000/health || exit 1
-CMD sh -c "sed -i 's|TILESERVER_URL|${TILESERVER_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CDN_URL|${CDN_URL}|g' /etc/nginx/nginx.conf && sed -i 's|MAIN_API_URL|${MAIN_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|FEEDBACK_API_URL|${FEEDBACK_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CALENDAR_API_URL|${CALENDAR_API_URL}|g' /etc/nginx/nginx.conf && nginx -g 'daemon off;'"
+CMD sh -c "sed -i 's|TILESERVER_URL|${TILESERVER_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CDN_URL|${CDN_URL}|g' /etc/nginx/nginx.conf && sed -i 's|MAIN_API_URL|${MAIN_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|FEEDBACK_API_URL|${FEEDBACK_API_URL}|g' /etc/nginx/nginx.conf && nginx -g 'daemon off;'"

webclient/nginx.conf

@@ -70,9 +70,6 @@ http {
     location /api/feedback {
       proxy_pass FEEDBACK_API_URL;
     }
-    location /api/calendar {
-      proxy_pass CALENDAR_API_URL;
-    }
     location /cdn {
       proxy_pass CDN_URL;
     }