Merge branch 'main' into vue3

TUM-Dev · Mar 28, 2023 · b8cb11d · b8cb11d
2 parents 7b58985 + 79527dd
commit b8cb11d
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 47 deletions.
diff --git a/data/sources/coordinates/rest.yaml b/data/sources/coordinates/rest.yaml
@@ -5,6 +5,7 @@
 "0205.03.302": { lat: 48.147494785237, lon: 11.567622229204972 }
 "0305.04.508": { lat: 48.14609440391391, lon: 11.569374210372473 }
 "0503.02.345A": { lat: 48.1483384891566, lon: 11.565865189789264 }
+"0509.02.953A": { lat: 48.14930262787317, lon: 11.566896808473047 }
 
 # === Weitere Südgelände ===
 "0206.EG.002": { lat: 48.14712792949811, lon: 11.567150950288777 }
@@ -15,6 +16,9 @@
 "1551.01.051": { lat: 48.13620389234808, lon: 11.59965789617982 }
 "2522.03.030": { lat: 48.13641906661374, lon: 11.601746419879248 }
 
+# === Heilbronn ===
+"1902.EG.013": { lat: 49.14852, lon: 9.21514 }
+
 # === Augustenstr ===
 "2903.EG.002": { lat: 48.14800782818159, lon: 11.5629103854979 }
 

diff --git a/deployment/k3s/templates/deployments/backend/calendar-deployment.yaml b/deployment/k3s/templates/deployments/backend/calendar-deployment.yaml
@@ -48,7 +48,7 @@ spec:
           resources:
             requests:
               cpu: 10m
-              memory: 200Mi
+              memory: 50Mi
             limits:
               memory: 500Mi
           livenessProbe:

diff --git a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml
@@ -68,7 +68,7 @@ spec:
           resources:
             requests:
               cpu: {{ if eq "nav.tum.de" $.Values.url }}1{{ else }}0.1{{ end }}
-              memory: 500Mi
+              memory: {{ if eq "nav.tum.de" $.Values.url }}600Mi{{ else }}300Mi{{ end }}
             limits:
               memory: 1Gi
           livenessProbe:

diff --git a/server/calendar/Cargo.lock b/server/calendar/Cargo.lock
diff --git a/server/calendar/Cargo.toml b/server/calendar/Cargo.toml
@@ -26,9 +26,9 @@ actix-web-prometheus = "0.1.2"
 rustls = "0.20.8"
 awc = { version= "3.1.1", features = ["rustls"] }
 serde = { version = "1.0.158", features = ["derive"] }
-serde_json = "1.0.94"
+serde_json = "1.0.95"
 actix-cors = "0.6.4"
-tokio = { version = "1.26.0", features = ["full"] }
+tokio = { version = "1.27.0", features = ["full"] }
 futures = "0.3.26"
 chrono = { version="0.4.23", features=["serde"] }
 minidom = "0.15.1"

diff --git a/server/feedback/Cargo.lock b/server/feedback/Cargo.lock
diff --git a/server/feedback/Cargo.toml b/server/feedback/Cargo.toml
@@ -17,15 +17,15 @@ path = "src/main.rs"
 strip = true
 
 [dependencies]
-regex = "1.7.2"
+regex = "1.7.3"
 log = "0.4.17"
 octocrab = "0.19.0"
 actix-web = "4.3.1"
 actix-web-prometheus = "0.1.2"
 serde = { version = "1.0.158", features = ["derive"] }
-serde_json = "1.0.94"
+serde_json = "1.0.95"
 actix-cors = "0.6.4"
-tokio = { version = "1.26.0", features = ["full"] }
+tokio = { version = "1.27.0", features = ["full"] }
 rand = "0.8.5"
 structopt = "0.3.26"
 env_logger = "0.10.0"

diff --git a/server/main-api/Cargo.lock b/server/main-api/Cargo.lock
diff --git a/server/main-api/Cargo.toml b/server/main-api/Cargo.toml
@@ -25,12 +25,12 @@ rustls = "0.20.8"
 awc = { version="3.1.1",features=["rustls"] }
 cached = "0.42.0"
 serde = { version = "1.0.158", features = ["derive"] }
-serde_json = "1.0.94"
+serde_json = "1.0.95"
 actix-cors = "0.6.4"
-tokio = { version = "1.26.0", features = ["full"] }
+tokio = { version = "1.27.0", features = ["full"] }
 futures = "0.3.26"
 env_logger = "0.10.0"
-image = "0.24.5"
+image = "0.24.6"
 rusttype= "0.9.3"
 imageproc= "0.23.0"
 rand = "0.8.5"