Chore/inline feedback (#1118)

* merged the main api and the feedback subsystem * adapted the deployment of said change * Documented the changes
TUM-Dev · Apr 28, 2024 · e3e2d37 · e3e2d37
1 parent 0b2f9fc
commit e3e2d37
Show file tree

Hide file tree

Showing 27 changed files with 473 additions and 831 deletions.
diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -60,12 +60,3 @@ jobs:
     permissions:
       contents: read
       packages: write
-  feedback-deployment:
-    uses: ./.github/workflows/_restart-argocd.yml
-    if: ${{ github.ref }} == 'refs/heads/main'
-    needs:
-      - server-build
-    with:
-      deployment: feedback
-    secrets:
-      ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # NavigaTUM
 
 [![Deployment Status](https://argocd.nav.tum.sexy/api/badge?name=navigatum-prod)](https://argocd.nav.tum.sexy/applications/navigatum-prod)
-[![Website Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/5/uptime/720?label=Website%20Uptime/30&labelSuffix=d)](https://uptime.nav.tum.sexy/status/navigatum)
-[![API Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/2/uptime/720?label=API%20Uptime/30&labelSuffix=d)](https://uptime.nav.tum.sexy/status/navigatum)
-[![CDN Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/1/uptime/720?label=CDN%20Uptime/30&labelSuffix=d)](https://uptime.nav.tum.sexy/status/navigatum)
+[![Website Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/5/uptime/720?label=Website%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
+[![API Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/2/uptime/720?label=API%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
+[![CDN Uptime over 30 days](https://nav-monitoring.mm.rbg.tum.de/api/badge/1/uptime/720?label=CDN%20Uptime/30&labelSuffix=d)](https://nav-monitoring.mm.rbg.tum.de/status/navigatum)
 
 NavigaTUM is a tool developed by students for students, to help you get around at [TUM](https://tum.de).
 Feel free to contribute, we are open to new people 😄.

diff --git a/deployment/k3s/templates/deployments/feedback-deployment.yaml b/deployment/k3s/templates/deployments/feedback-deployment.yaml
diff --git a/deployment/k3s/templates/deployments/webclient-deployment.yaml b/deployment/k3s/templates/deployments/webclient-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: web
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   replicas: 1
   revisionHistoryLimit: 0
@@ -24,7 +24,7 @@ spec:
         app.kubernetes.io/part-of: navigatum
         app.kubernetes.io/name: web
     spec:
-      priorityClassName: {{ $.Values.url }}
+      priorityClassName: { { $.Values.url } }
       containers:
         - name: webclient
           image: "ghcr.io/tum-dev/navigatum-webclient:{{ $.Values.tag }}"
@@ -39,8 +39,6 @@ spec:
               value: http://cdn-svc.navigatum.svc.cluster.local:3002
             - name: MAIN_API_URL
               value: http://api-svc.navigatum.svc.cluster.local:3003
-            - name: FEEDBACK_API_URL
-              value: http://feedback-svc.navigatum.svc.cluster.local:3004
           resources:
             requests:
               cpu: 50m
@@ -63,9 +61,9 @@ spec:
             allowPrivilegeEscalation: false
             capabilities:
               drop:
-              - ALL
+                - ALL
               add:
-              - CHOWN
-              - DAC_OVERRIDE
-              - SETGID
-              - SETUID
+                - CHOWN
+                - DAC_OVERRIDE
+                - SETGID
+                - SETUID
diff --git a/deployment/k3s/templates/networking/ingress.yaml b/deployment/k3s/templates/networking/ingress.yaml
@@ -4,16 +4,11 @@ metadata:
   name: ingress
   labels:
     app.kubernetes.io/part-of: navigatum
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   entryPoints:
     - websecure
   routes:
-    - kind: Rule
-      match: Host(`{{ $.Values.url }}`) && PathPrefix(`/api/feedback/`)
-      services:
-        - name: feedback-svc
-          port: 3004
     - kind: Rule
       match: Host(`{{ $.Values.url }}`) && PathPrefix(`/api/`)
       services:
@@ -53,15 +48,15 @@ spec:
       middlewares:
         - name: nav-tum-de-redirect
   tls:
-    secretName: {{ $.Values.url }}
+    secretName: { { $.Values.url } }
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
   name: ingress-http
   labels:
     app.kubernetes.io/part-of: navigatum
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   entryPoints:
     - web

diff --git a/deployment/k3s/templates/networking/service.yaml b/deployment/k3s/templates/networking/service.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: api
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   type: ClusterIP
   selector:
@@ -18,30 +18,12 @@ spec:
 ---
 apiVersion: v1
 kind: Service
-metadata:
-  name: feedback-svc
-  labels:
-    app.kubernetes.io/part-of: navigatum
-    app.kubernetes.io/name: feedback
-  namespace: {{ $.Values.namespace }}
-spec:
-  type: ClusterIP
-  selector:
-    app.kubernetes.io/part-of: navigatum
-    app.kubernetes.io/name: feedback
-  ports:
-    - name: http
-      port: 3004
-      targetPort: 3004
----
-apiVersion: v1
-kind: Service
 metadata:
   name: maps-svc
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: maps
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   type: ClusterIP
   selector:
@@ -62,7 +44,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: cdn
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   type: ClusterIP
   selector:
@@ -80,7 +62,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: web
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   type: ClusterIP
   selector:
@@ -90,7 +72,7 @@ spec:
     - name: http
       port: 3000
       targetPort: 3000
-{{- if eq "nav.tum.de" $.Values.url }}
+  { { - if eq "nav.tum.de" $.Values.url } }
 ---
 apiVersion: v1
 kind: Service
@@ -99,7 +81,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: navigatum
     app.kubernetes.io/name: postgres
-  namespace: {{ $.Values.namespace }}
+  namespace: { { $.Values.namespace } }
 spec:
   type: ClusterIP
   selector:
@@ -109,4 +91,4 @@ spec:
     - name: postgres
       port: 5432
       targetPort: 5432
-  {{ end }}
+  { { end } }