Revert "chore:rsync based file transfer (#879)"

This reverts commit 4ced11b. This reverts commit 224afde.
TUM-Dev · Nov 12, 2023 · f3073ab · f3073ab
1 parent 224afde
commit f3073ab
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 39 deletions.
diff --git a/deployment/k3s/files/rsyncd.conf b/deployment/k3s/files/rsyncd.conf
diff --git a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml
@@ -104,19 +104,12 @@ spec:
             failureThreshold: 6
             periodSeconds: 10
         - name: tileserver-src # serve tileserver-vol  at /maps/vol/...
-          image: alpine:3.18
+          image: nginx:1.25
           imagePullPolicy: IfNotPresent
-          command:
-          - sh
-          - -c
-          - "apk add --no-cache rsync && rsync --daemon --no-detach --config=/etc/rsyncd.conf"
           ports:
-            - containerPort: 873
-              name: rsync
+            - containerPort: 80
+              name: http
           volumeMounts:
             - name: tileserver-vol
-              mountPath: /home/maps/vol
+              mountPath: /usr/share/nginx/html/maps/vol
               readOnly: true
-            - name: tileserver-config
-              mountPath: /etc/rsyncd.conf
-              subPath: rsyncd.conf
diff --git a/deployment/k3s/templates/deployments/maps/tileserver-config.yaml b/deployment/k3s/templates/deployments/maps/tileserver-config.yaml
@@ -6,8 +6,6 @@ metadata:
 data:
   osm-liberty.json: |-
 {{ .Files.Get "files/maps/osm-liberty.json" | indent 4 }}
-  rsyncd.conf: |-
-{{ .Files.Get "files/maps/rsyncd.conf" | indent 4 }}
   config.json: |-
     {
       "options": {

diff --git a/deployment/k3s/templates/networking/ingress.yaml b/deployment/k3s/templates/networking/ingress.yaml
@@ -28,7 +28,7 @@ spec:
       match: Host(`{{ $.Values.url }}`) && PathPrefix(`/maps/vol/`)
       services:
         - name: maps-svc
-          port: 873
+          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
@@ -70,8 +70,8 @@ spec:
       port: 3001
       targetPort: 8080
     - name: src
-      port: 873
-      targetPort: 873
+      port: 7771
+      targetPort: 80
 ---
 apiVersion: v1
 kind: Service

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
   tileserver-init-src:
     image: alpine:latest
     restart: on-failure
-    command: rsync --update --compress --progress --partial --human-readable --stats rsync://nav.tum.de/maps/vol/output.mbtiles /map/output.mbtiles
+    command: wget -P /map --continue https://nav.tum.de/maps/vol/output.mbtiles
     volumes:
       - ./map:/map
   tileserver:
@@ -58,15 +58,6 @@ services:
         condition: service_completed_successfully
       tileserver-init-src:
         condition: service_completed_successfully
-  tileserver-rsync-deamon-src:
-    image: alpine:3.18
-    restart: always
-    command: sh -c "apk add --no-cache rsync && rsync --daemon --no-detach --config=/etc/rsyncd.conf"
-    volumes:
-      - ./deployment/k3s/files/rsyncd.conf:/etc/rsyncd.conf:ro
-      - ./map/output.mbtiles:/home/maps/vol/output.mbtiles:ro
-    ports:
-      - "873:873"
   # cdn
   data:
     image: ghcr.io/tum-dev/navigatum-cdn:latest