Merge pull request #14 from DioCrafts/feature/frontend-helm-chart

fix errors
DioCrafts · Nov 17, 2024 · 15fcd94 · 15fcd94
2 parents d2081d0 + 08638e1
commit 15fcd94
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 200 deletions.
diff --git a/api-gateway/backend/Dockerfile b/api-gateway/backend/Dockerfile
@@ -23,8 +23,6 @@ WORKDIR /usr/local/bin
 # Copia el binario estático desde la etapa de construcción
 COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/flusso_api_gateway .
 
-# Copia los archivos estáticos
-COPY src/gui/static /usr/local/bin/static
 
 # Exponer los puertos en los que la aplicación escucha
 EXPOSE 8080

diff --git a/api-gateway/backend/src/gui/gui_server.rs b/api-gateway/backend/src/gui/gui_server.rs
diff --git a/api-gateway/backend/src/gui/mod.rs b/api-gateway/backend/src/gui/mod.rs
diff --git a/api-gateway/backend/src/gui/static/app.js b/api-gateway/backend/src/gui/static/app.js
diff --git a/api-gateway/backend/src/gui/static/index.html b/api-gateway/backend/src/gui/static/index.html
diff --git a/api-gateway/backend/src/gui/static/styles.css b/api-gateway/backend/src/gui/static/styles.css
diff --git a/api-gateway/frontend/Dockerfile b/api-gateway/frontend/Dockerfile
@@ -1,4 +1,4 @@
-# Etapa 1: Construcción de la aplicación React
+# Etapa 1: Construcción de los archivos estáticos
 FROM node:18-alpine AS builder
 WORKDIR /app
 COPY package.json package-lock.json ./
@@ -8,6 +8,6 @@ RUN npm run build
 
 # Etapa 2: Servidor Nginx para los archivos estáticos
 FROM nginx:stable-alpine
-COPY --from=builder /app/build /usr/share/nginx/html
+COPY --from=builder /app/dist /usr/share/nginx/html
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/api-gateway/frontend/src/apiClient.ts b/api-gateway/frontend/src/apiClient.ts
@@ -1,10 +1,11 @@
 import axios from 'axios';
 
-// Configura Axios para que apunte al backend
+// Configura Axios para que apunte al API REST en Kubernetes
 const apiClient = axios.create({
-  baseURL: 'http://localhost:3000/api', // Cambia esto si el backend está en otra URL o puerto
+  baseURL: 'http://flusso-api-gateway-api-gateway.default.svc.cluster.local:8081/api', // URL del API REST
 });
 
+// Funciones para consumir la API REST
 export const getMetrics = async () => {
   const response = await apiClient.get('/metrics');
   return response.data;

diff --git a/api-gateway/frontend/vite.config.ts b/api-gateway/frontend/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     port: 5173, // Cambia si hay conflictos de puertos
     open: true, // Abre el navegador automáticamente
     proxy: {
-        '/api': 'http://localhost:3000', // Redirige las solicitudes al backend
+        '/api': 'http://flusso-api-gateway-api-gateway.default.svc.cluster.local:8081', // Redirige las solicitudes al API REST en Kubernetes
       },
   },
 });
diff --git a/helm/api-gateway/backend/templates/service.yaml b/helm/api-gateway/backend/templates/service.yaml
@@ -5,19 +5,15 @@ metadata:
   labels:
     app: {{ include "api-gateway.name" . }}
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
     - name: main
       port: 80
       targetPort: 8080
       protocol: TCP
-    - name: dashboard
+    - name: api-rest
       port: 8081
       targetPort: 8081
       protocol: TCP
-    - name: api-gateway
-      port: 8082
-      targetPort: {{ .Values.apiGateway.port }}
-      protocol: TCP
   selector:
     app: {{ include "api-gateway.name" . }}
diff --git a/helm/api-gateway/backend/values.yaml b/helm/api-gateway/backend/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: diocrafts/flusso-api-gateway
-  tag: v0.0.44
+  tag: v0.0.46
   pullPolicy: IfNotPresent
 
 serviceAccount:

diff --git a/helm/api-gateway/frontend/values.yaml b/helm/api-gateway/frontend/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: diocrafts/flusso-api-gateway-gui
-  tag: v0.0.44
+  tag: v0.0.50
   pullPolicy: IfNotPresent
 
 service: