From 5131b32a3fc8759428dd015dedf7a0193c68578b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 19 Dec 2021 10:48:44 +0100 Subject: [PATCH] workadventure: Cleanup 80% of the manifests --- apps/workadventure/README.md | 13 ++++ apps/workadventure/maps-deployment.yaml | 69 ------------------- .../redisinsight-deployment.yaml | 47 ------------- .../unused/redisinsight-deployment.yaml | 24 +++++++ .../maps-claim0-persistentvolumeclaim.yaml | 0 apps/workadventure/v1/maps-deployment.yaml | 46 +++++++++++++ .../{ => v1}/messages-deployment.yaml | 8 --- .../pusher-claim0-persistentvolumeclaim.yaml | 0 .../{ => v1}/pusher-deployment.yaml | 7 +- .../{ => v1}/uploader-deployment.yaml | 7 +- 10 files changed, 91 insertions(+), 130 deletions(-) create mode 100644 apps/workadventure/README.md delete mode 100644 apps/workadventure/maps-deployment.yaml delete mode 100644 apps/workadventure/redisinsight-deployment.yaml create mode 100644 apps/workadventure/unused/redisinsight-deployment.yaml rename apps/workadventure/{ => v1}/maps-claim0-persistentvolumeclaim.yaml (100%) create mode 100644 apps/workadventure/v1/maps-deployment.yaml rename apps/workadventure/{ => v1}/messages-deployment.yaml (83%) rename apps/workadventure/{ => v1}/pusher-claim0-persistentvolumeclaim.yaml (100%) rename apps/workadventure/{ => v1}/pusher-deployment.yaml (92%) rename apps/workadventure/{ => v1}/uploader-deployment.yaml (86%) diff --git a/apps/workadventure/README.md b/apps/workadventure/README.md new file mode 100644 index 0000000..239ccf0 --- /dev/null +++ b/apps/workadventure/README.md @@ -0,0 +1,13 @@ +## Workedvanture + +## Components + +### Back + +### Front + +### Pusher + +### Uploader + +### Messages diff --git a/apps/workadventure/maps-deployment.yaml b/apps/workadventure/maps-deployment.yaml deleted file mode 100644 index c4277cb..0000000 --- a/apps/workadventure/maps-deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - traefik.enable: "true" - traefik.http.routers.maps-ssl.entryPoints: websecure - traefik.http.routers.maps-ssl.rule: Host(`maps.workadventure.localhost`) - traefik.http.routers.maps-ssl.service: maps - traefik.http.routers.maps-ssl.tls: "true" - traefik.http.routers.maps.entryPoints: web,traefik - traefik.http.routers.maps.rule: Host(`maps.workadventure.localhost`) - traefik.http.services.maps.loadbalancer.server.port: "80" - creationTimestamp: null - labels: - io.kompose.service: maps - name: maps -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: maps - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - traefik.enable: "true" - traefik.http.routers.maps-ssl.entryPoints: websecure - traefik.http.routers.maps-ssl.rule: Host(`maps.workadventure.localhost`) - traefik.http.routers.maps-ssl.service: maps - traefik.http.routers.maps-ssl.tls: "true" - traefik.http.routers.maps.entryPoints: web,traefik - traefik.http.routers.maps.rule: Host(`maps.workadventure.localhost`) - traefik.http.services.maps.loadbalancer.server.port: "80" - creationTimestamp: null - labels: - io.kompose.service: maps - spec: - containers: - - env: - - name: DEBUG_MODE - - name: FRONT_URL - value: http://play.workadventure.localhost - - name: HOST - value: 0.0.0.0 - - name: NODE_ENV - value: development - - name: STARTUP_COMMAND_0 - value: sudo a2enmod headers - - name: STARTUP_COMMAND_1 - value: yarn install - - name: STARTUP_COMMAND_2 - value: yarn run dev & - image: thecodingmachine/php:8.1-v4-apache-node12 - name: maps - resources: {} - volumeMounts: - - mountPath: /var/www/html - name: maps-claim0 - restartPolicy: Always - volumes: - - name: maps-claim0 - persistentVolumeClaim: - claimName: maps-claim0 -status: {} diff --git a/apps/workadventure/redisinsight-deployment.yaml b/apps/workadventure/redisinsight-deployment.yaml deleted file mode 100644 index 431936f..0000000 --- a/apps/workadventure/redisinsight-deployment.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - traefik.enable: "true" - traefik.http.routers.redisinsight-ssl.entryPoints: websecure - traefik.http.routers.redisinsight-ssl.rule: Host(`redis.workadventure.localhost`) - traefik.http.routers.redisinsight-ssl.service: redisinsight - traefik.http.routers.redisinsight-ssl.tls: "true" - traefik.http.routers.redisinsight.entryPoints: web - traefik.http.routers.redisinsight.rule: Host(`redis.workadventure.localhost`) - traefik.http.services.redisinsight.loadbalancer.server.port: "8001" - creationTimestamp: null - labels: - io.kompose.service: redisinsight - name: redisinsight -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: redisinsight - strategy: {} - template: - metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - traefik.enable: "true" - traefik.http.routers.redisinsight-ssl.entryPoints: websecure - traefik.http.routers.redisinsight-ssl.rule: Host(`redis.workadventure.localhost`) - traefik.http.routers.redisinsight-ssl.service: redisinsight - traefik.http.routers.redisinsight-ssl.tls: "true" - traefik.http.routers.redisinsight.entryPoints: web - traefik.http.routers.redisinsight.rule: Host(`redis.workadventure.localhost`) - traefik.http.services.redisinsight.loadbalancer.server.port: "8001" - creationTimestamp: null - labels: - io.kompose.service: redisinsight - spec: - containers: - - image: redislabs/redisinsight:latest - name: redisinsight - resources: {} - restartPolicy: Always -status: {} diff --git a/apps/workadventure/unused/redisinsight-deployment.yaml b/apps/workadventure/unused/redisinsight-deployment.yaml new file mode 100644 index 0000000..7ccb555 --- /dev/null +++ b/apps/workadventure/unused/redisinsight-deployment.yaml @@ -0,0 +1,24 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + labels: + io.kompose.service: redisinsight + name: redisinsight +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: redisinsight + strategy: {} + template: + metadata: + labels: + io.kompose.service: redisinsight + spec: + containers: + - image: redislabs/redisinsight:latest + name: redisinsight + resources: {} + restartPolicy: Always +status: {} diff --git a/apps/workadventure/maps-claim0-persistentvolumeclaim.yaml b/apps/workadventure/v1/maps-claim0-persistentvolumeclaim.yaml similarity index 100% rename from apps/workadventure/maps-claim0-persistentvolumeclaim.yaml rename to apps/workadventure/v1/maps-claim0-persistentvolumeclaim.yaml diff --git a/apps/workadventure/v1/maps-deployment.yaml b/apps/workadventure/v1/maps-deployment.yaml new file mode 100644 index 0000000..eae3944 --- /dev/null +++ b/apps/workadventure/v1/maps-deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + labels: + io.kompose.service: maps + name: maps +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: maps + strategy: + type: Recreate + template: + metadata: + labels: + io.kompose.service: maps + spec: + containers: + - env: + - name: DEBUG_MODE + - name: FRONT_URL + value: http://play.workadventure.localhost + - name: HOST + value: 0.0.0.0 + - name: NODE_ENV + value: development + - name: STARTUP_COMMAND_0 + value: sudo a2enmod headers + - name: STARTUP_COMMAND_1 + value: yarn install + - name: STARTUP_COMMAND_2 + value: yarn run dev & + image: thecodingmachine/php:8.1-v4-apache-node12 + name: maps + resources: {} + volumeMounts: + - mountPath: /var/www/html + name: maps-claim0 + restartPolicy: Always + volumes: + - name: maps-claim0 + persistentVolumeClaim: + claimName: maps-claim0 +status: {} diff --git a/apps/workadventure/messages-deployment.yaml b/apps/workadventure/v1/messages-deployment.yaml similarity index 83% rename from apps/workadventure/messages-deployment.yaml rename to apps/workadventure/v1/messages-deployment.yaml index c5f5983..636b3aa 100644 --- a/apps/workadventure/messages-deployment.yaml +++ b/apps/workadventure/v1/messages-deployment.yaml @@ -1,10 +1,6 @@ apiVersion: apps/v1 kind: Deployment metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - creationTimestamp: null labels: io.kompose.service: messages name: messages @@ -17,10 +13,6 @@ spec: type: Recreate template: metadata: - annotations: - kompose.cmd: /home/nico/Downloads/kompose convert - kompose.version: 1.26.0 (40646f47) - creationTimestamp: null labels: io.kompose.service: messages spec: diff --git a/apps/workadventure/pusher-claim0-persistentvolumeclaim.yaml b/apps/workadventure/v1/pusher-claim0-persistentvolumeclaim.yaml similarity index 100% rename from apps/workadventure/pusher-claim0-persistentvolumeclaim.yaml rename to apps/workadventure/v1/pusher-claim0-persistentvolumeclaim.yaml diff --git a/apps/workadventure/pusher-deployment.yaml b/apps/workadventure/v1/pusher-deployment.yaml similarity index 92% rename from apps/workadventure/pusher-deployment.yaml rename to apps/workadventure/v1/pusher-deployment.yaml index 5855f53..60aaa0f 100644 --- a/apps/workadventure/pusher-deployment.yaml +++ b/apps/workadventure/v1/pusher-deployment.yaml @@ -18,9 +18,10 @@ spec: io.kompose.service: pusher spec: containers: - - args: + - command: - yarn - - dev + - run + - runprod env: - name: ADMIN_API_TOKEN - name: API_URL @@ -44,7 +45,7 @@ spec: value: yarn install - name: STARTUP_COMMAND_2 value: while [ ! -f /usr/src/app/src/Messages/generated/messages_pb.js ]; do sleep 1; done - image: thecodingmachine/nodejs:14 + image: thecodingmachine/workadventure-pusher:v1.6.4 name: pusher resources: {} volumeMounts: diff --git a/apps/workadventure/uploader-deployment.yaml b/apps/workadventure/v1/uploader-deployment.yaml similarity index 86% rename from apps/workadventure/uploader-deployment.yaml rename to apps/workadventure/v1/uploader-deployment.yaml index b3c12e2..3960e10 100644 --- a/apps/workadventure/uploader-deployment.yaml +++ b/apps/workadventure/v1/uploader-deployment.yaml @@ -17,15 +17,16 @@ spec: io.kompose.service: uploader spec: containers: - - args: + - command: - yarn - - dev + - run + - runprod env: - name: DEBUG value: '*' - name: STARTUP_COMMAND_1 value: yarn install - image: thecodingmachine/nodejs:12 + image: thecodingmachine/workadventure-uploader:v1.6.4 name: uploader resources: {} volumeMounts: