From e02bb02b1668260a99e335ca903cb7acb73bc762 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 29 Sep 2022 23:41:50 +0200 Subject: [PATCH] update workandventure test chart --- apps/workadventure/v3/Chart.yaml | 2 +- .../v3/templates/back-deployment.yaml | 2 +- .../v3/templates/front-deployment.yaml | 28 +++++++++++++------ apps/workadventure/v3/templates/nginx.yaml | 2 +- .../v3/templates/pusher-deployment.yaml | 2 +- apps/workadventure/v3/values.yaml | 2 +- generic/ungleich-hardware-sleep.yaml | 7 ++--- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/apps/workadventure/v3/Chart.yaml b/apps/workadventure/v3/Chart.yaml index aca79cb..f37c246 100644 --- a/apps/workadventure/v3/Chart.yaml +++ b/apps/workadventure/v3/Chart.yaml @@ -6,4 +6,4 @@ type: application version: 0.1.0 -appVersion: "21.0.7-apache" +appVersion: "v1.12.4" diff --git a/apps/workadventure/v3/templates/back-deployment.yaml b/apps/workadventure/v3/templates/back-deployment.yaml index 1861e0d..2ece5dc 100644 --- a/apps/workadventure/v3/templates/back-deployment.yaml +++ b/apps/workadventure/v3/templates/back-deployment.yaml @@ -46,7 +46,7 @@ spec: value: "true" - name: TURN_STATIC_AUTH_SECRET value: SomeStaticAuthSecret - image: thecodingmachine/workadventure-back:v1.6.4 + image: thecodingmachine/workadventure-back:{{ .Chart.AppVersion }} name: back securityContext: runAsUser: 0 diff --git a/apps/workadventure/v3/templates/front-deployment.yaml b/apps/workadventure/v3/templates/front-deployment.yaml index 5f308dd..08fe80a 100644 --- a/apps/workadventure/v3/templates/front-deployment.yaml +++ b/apps/workadventure/v3/templates/front-deployment.yaml @@ -20,30 +20,40 @@ spec: - env: # FIXME - name: DEBUG_MODE + value: "true" # FIXME - name: DISABLE_ANONYMOUS + value: "false" - name: DISABLE_NOTIFICATIONS + value: "false" # FIXME - name: HOST value: 0.0.0.0 # FIXME - - name: ICON_URL - value: http://{{ .Release.Name }}-icon - name: JITSI_PRIVATE_MODE + value: "false" - name: JITSI_URL + value: "meet.jit.si" - name: LIVE_RELOAD value: "true" + - name: ENABLE_FEATURE_MAP_EDITOR + value: "false" - name: MAX_PER_GROUP + value: "4" - name: MAX_USERNAME_LENGTH + value: "10" - name: NODE_ENV value: development - name: OPID_LOGIN_SCREEN_PROVIDER + - name: ICON_URL + value: //{{ .Release.Name }}-icon - name: PUSHER_URL - value: http://{{ .Release.Name }}-pusher + value: //{{ .Release.Name }}-pusher - name: SKIP_RENDER_OPTIMIZATIONS + value: "false" - name: START_ROOM_URL - name: STUN_SERVER - value: stun:stun.l.google.com:19302 + value: "stun:stun.l.google.com:19302" - name: TURN_SERVER value: turn:{{ .Release.Name }}-coturn:3478,turns:{{ .Release.Name }}-coturn:5349 - name: TURN_USER @@ -55,12 +65,12 @@ spec: - containerPort: 80 securityContext: runAsUser: 0 - image: thecodingmachine/workadventure-front:v1.6.4 + image: thecodingmachine/workadventure-front:{{ .Chart.AppVersion }} name: front - command: - - sh - - -c - - "./templater.sh; yarn install; node /usr/local/bin/enable_apache_mods.js | bash; node /usr/local/bin/startup_commands.js | bash ; /usr/local/bin/apache-expose-envvars.sh; apache2-foreground" + # command: + # - sh + # - -c + # - "./templater.sh; yarn install; node /usr/local/bin/enable_apache_mods.js | bash; node /usr/local/bin/startup_commands.js | bash ; /usr/local/bin/apache-expose-envvars.sh; apache2-foreground" resources: {} restartPolicy: Always diff --git a/apps/workadventure/v3/templates/nginx.yaml b/apps/workadventure/v3/templates/nginx.yaml index 74941f0..20dd8d7 100644 --- a/apps/workadventure/v3/templates/nginx.yaml +++ b/apps/workadventure/v3/templates/nginx.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: nginx - image: ungleich/ungleich-certbot:0.3.2 + image: ungleich/ungleich-certbot:1.1.3 ports: - containerPort: 443 name: https diff --git a/apps/workadventure/v3/templates/pusher-deployment.yaml b/apps/workadventure/v3/templates/pusher-deployment.yaml index 5f712ef..4ea0833 100644 --- a/apps/workadventure/v3/templates/pusher-deployment.yaml +++ b/apps/workadventure/v3/templates/pusher-deployment.yaml @@ -45,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/workadventure-pusher:v1.6.4 + image: thecodingmachine/workadventure-pusher:{{ .Chart.AppVersion }} name: pusher ports: - containerPort: 8080 diff --git a/apps/workadventure/v3/values.yaml b/apps/workadventure/v3/values.yaml index 6e48d2b..35a9610 100644 --- a/apps/workadventure/v3/values.yaml +++ b/apps/workadventure/v3/values.yaml @@ -1,4 +1,4 @@ -clusterDomain: c2.k8s.ooo +clusterDomain: p10.k8s.ooo email: technik@ungleich.ch letsencryptStaging: "yes" diff --git a/generic/ungleich-hardware-sleep.yaml b/generic/ungleich-hardware-sleep.yaml index 81d4bd9..94e800f 100644 --- a/generic/ungleich-hardware-sleep.yaml +++ b/generic/ungleich-hardware-sleep.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Pod metadata: - name: ungleich-hardware-server119-2 + name: ungleich-hardware-server116 spec: containers: - - name: ungleich-hardware-server119 + - name: ungleich-hardware-server image: ungleich/ungleich-hardware:0.0.5 args: - sleep @@ -15,8 +15,7 @@ spec: securityContext: privileged: true nodeSelector: - kubernetes.io/hostname: "server119" - + kubernetes.io/hostname: "server116" volumes: - name: dev hostPath: