frontend rewrite fix

Author: wizzfi1

frontend-service/server.js

@@ -8,9 +8,10 @@ dotenv.config();
 
 const app = express();
 const PORT = process.env.PORT || 3007;
+const HOST = process.env.HOST || '0.0.0.0';
 
 // Configure base path from environment or use '/frontend' as default
-const BASE_PATH = process.env.BASE_PATH || '';
+const BASE_PATH = process.env.BASE_PATH || '/frontend';
 
 app.set('view engine', 'ejs');
 app.set('views', path.join(__dirname, 'views'));
@@ -24,25 +25,25 @@ app.use(session({
   saveUninitialized: true,
 }));
 
-// Health check at root path for Kubernetes probes
-app.get('/health', (req, res) => {
+// Unified health check
+app.get(`${BASE_PATH}/health`, (req, res) => {
   res.json({
     status: 'UP',
     details: 'Frontend service healthy'
   });
 });
 
-// Root redirect - now using BASE_PATH
+// Root redirect
 app.get('/', (req, res) => {
   res.redirect(`${BASE_PATH}/login`);
 });
 
-// Show login page
+// Login page
 app.get(`${BASE_PATH}/login`, (req, res) => {
   res.render('login', { error: null });
 });
 
-// Submit login form
+// Login submit
 app.post(`${BASE_PATH}/login`, async (req, res) => {
   const { username, password } = req.body;
 
@@ -60,7 +61,7 @@ app.post(`${BASE_PATH}/login`, async (req, res) => {
   }
 });
 
-// Protected dashboard
+// Dashboard
 app.get(`${BASE_PATH}/dashboard`, async (req, res) => {
   if (!req.session.token) return res.redirect(`${BASE_PATH}/login`);
 
@@ -80,15 +81,6 @@ app.get(`${BASE_PATH}/dashboard`, async (req, res) => {
   }
 });
 
-// Additional health check at prefixed path for backward compatibility
-app.get(`${BASE_PATH}/health`, (req, res) => {
-  res.json({
-    status: 'UP',
-    details: 'Frontend service healthy'
-  });
+app.listen(PORT, HOST, () => {
+  console.log(`Frontend running on http://${HOST}:${PORT}${BASE_PATH}`);
 });
-
-app.listen(PORT, () => {
-  console.log(`Frontend running on port ${PORT}`);
-  console.log(`Using base path: '${BASE_PATH}'`);
-});

k8s/frontend/deployment.yaml

@@ -21,34 +21,34 @@ spec:
         - name: frontend-service
           image: wizfi/frontend-service:latest
           ports:
-            - containerPort: 3007  
+            - containerPort: 3007
           env:
             - name: PORT
               value: "3007"
             - name: HOST
               value: "0.0.0.0"
-            - name: BASE_PATH  # Added to match server.js configuration
+            - name: BASE_PATH
               value: "/frontend"
             - name: JWT_SECRET
               valueFrom:
                 secretKeyRef:
                   name: jwt-secret
                   key: JWT_SECRET
             - name: AUTH_SERVICE_URL
-              value: "http://auth-service:3000"  
+              value: "https://wizfiservices.duckdns.org/auth"
             - name: ADMIN_SERVICE_URL
-              value: "http://admin-service:3006"
+              value: "https://wizfiservices.duckdns.org/admin"
           livenessProbe:
             httpGet:
-              path: /health  # Changed to use root health endpoint
+              path: /frontend/health
               port: 3007
             initialDelaySeconds: 30
             periodSeconds: 10
             timeoutSeconds: 5
             failureThreshold: 3
           readinessProbe:
             httpGet:
-              path: /health  # Changed to use root health endpoint
+              path: /frontend/health
               port: 3007
             initialDelaySeconds: 5
             periodSeconds: 5
@@ -59,11 +59,11 @@ spec:
               memory: "512Mi"
               cpu: "500m"
             limits:
-              memory: "1Gi"  # Increased limit for stability
+              memory: "1Gi"
               cpu: "1000m"
           volumeMounts:
             - name: static-assets
               mountPath: /app/public
       volumes:
         - name: static-assets
-          emptyDir: {}
+          emptyDir: {}

wizfi-ingress.yaml

@@ -6,47 +6,32 @@ metadata:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-http
     nginx.ingress.kubernetes.io/app-root: /frontend/login
-    # Remove all rewrite rules and use exact path matching
-    nginx.ingress.kubernetes.io/rewrite-target: /$2           
-    # Simplified configuration without snippets
     nginx.ingress.kubernetes.io/use-regex: "true"
 spec:
   ingressClassName: nginx
   rules:
     - host: wizfiservices.duckdns.org
       http:
         paths:
-          # Frontend paths - exact matches
-          - path: /frontend/login
-            pathType: Exact
-            backend:
-              service:
-                name: frontend-service
-                port:
-                  number: 80
-          - path: /frontend/health
-            pathType: Exact
-            backend:
-              service:
-                name: frontend-service
-                port:
-                  number: 80
+          # Frontend paths - keep /frontend in request
           - path: /frontend
             pathType: Prefix
             backend:
               service:
                 name: frontend-service
                 port:
                   number: 80
-          # Other service paths
+
+          # Auth
           - path: /auth(/|$)(.*)
             pathType: Prefix
             backend:
               service:
                 name: auth-service
                 port:
                   number: 3000
-
+          
+          # User
           - path: /user(/|$)(.*)
             pathType: Prefix
             backend:
@@ -55,6 +40,7 @@ spec:
                 port:
                   number: 3001
 
+          # Billing
           - path: /billing(/|$)(.*)
             pathType: Prefix
             backend:
@@ -63,6 +49,7 @@ spec:
                 port:
                   number: 3002
 
+          # Payments
           - path: /payments(/|$)(.*)
             pathType: Prefix
             backend:
@@ -71,6 +58,7 @@ spec:
                 port:
                   number: 3003
 
+          # Notifications
           - path: /notify(/|$)(.*)
             pathType: Prefix
             backend:
@@ -79,6 +67,7 @@ spec:
                 port:
                   number: 3004
 
+          # Analytics
           - path: /analytics(/|$)(.*)
             pathType: Prefix
             backend:
@@ -87,6 +76,7 @@ spec:
                 port:
                   number: 3005
 
+          # Admin
           - path: /admin(/|$)(.*)
             pathType: Prefix
             backend:
@@ -98,4 +88,4 @@ spec:
   tls:
     - hosts:
         - wizfiservices.duckdns.org
-      secretName: wizfi-tls
+      secretName: wizfi-tls