Merge branch 'main' into chore/simpler-deployment

TUM-Dev · Nov 11, 2023 · 299bda4 · 299bda4
2 parents b477c0b + 29b8f2c
commit 299bda4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml
@@ -103,3 +103,13 @@ spec:
               port: tileserver
             failureThreshold: 6
             periodSeconds: 10
+        - name: tileserver-src # serve tileserver-vol  at /maps/vol/...
+          image: nginx:1.25
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 80
+              name: http
+          volumeMounts:
+            - name: tileserver-vol
+              mountPath: /usr/share/nginx/html/maps/vol
+              readOnly: true
diff --git a/deployment/k3s/templates/networking/ingress.yaml b/deployment/k3s/templates/networking/ingress.yaml
@@ -24,6 +24,11 @@ spec:
       services:
         - name: api-svc
           port: 3003
+    - kind: Rule
+      match: Host(`{{ $.Values.url }}`) && PathPrefix(`/maps/vol/`)
+      services:
+        - name: maps-svc
+          port: 7771
     - kind: Rule
       match: Host(`{{ $.Values.url }}`) && PathPrefix(`/maps/`)
       services:

diff --git a/deployment/k3s/templates/networking/service.yaml b/deployment/k3s/templates/networking/service.yaml
@@ -69,6 +69,9 @@ spec:
     - name: http
       port: 3001
       targetPort: 8080
+    - name: src
+      port: 7771
+      targetPort: 80
 ---
 apiVersion: v1
 kind: Service

diff --git a/webclient/vite.config.ts b/webclient/vite.config.ts
@@ -9,14 +9,7 @@ import path from "path";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import pluginRewriteAll from "vite-plugin-rewrite-all";
-import { sentryVitePlugin } from "@sentry/vite-plugin";
 
-// https://vitejs.dev/config/
-let commit_message = process.env.GIT_COMMIT_MESSAGE || "development";
-commit_message = commit_message
-  .replaceAll(/[^a-z0-9 ]+/gi, "_")
-  .replaceAll(/_$/g, "")
-  .trim();
 export default defineConfig({
   envDir: path.resolve(__dirname, "./env"),
   appType: "spa",