Merge pull request #3 from mconf/v1.23.8-dev

fix: helm updates

Author: fcecagno

contrib/helm/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.9-dev1
+version: 1.23.8-3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.9-dev1"
+appVersion: "v1.23.8-3"
 
 dependencies:
   - name: redis

contrib/helm/templates/_helpers.tpl

@@ -69,7 +69,7 @@ Create the domains
 {{- end }}
 {{- define "workadventure.playUrl" -}}
 {{- if .Values.singleDomain -}}
-/
+{{ printf "https://%s" .Values.domainName }}
 {{- else -}}
 {{- if .Values.play.ingress.frontDomainName -}}
 {{ printf "https://%s" .Values.play.ingress.frontDomainName }}
@@ -84,7 +84,7 @@ Create the domains
 {{- end -}}
 {{- define "workadventure.pusherUrl" -}}
 {{- if .Values.singleDomain -}}
-/
+{{ printf "https://%s" .Values.domainName }}
 {{- else -}}
 {{- if .Values.play.ingress.pusherDomainName -}}
 {{ printf "https://%s" .Values.play.ingress.pusherDomainName }}

contrib/helm/templates/mapstorage-deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.mapstorage.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -127,3 +128,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}

contrib/helm/templates/mapstorage-env.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.mapstorage.enabled }}
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -18,3 +19,4 @@ data:
   {{- range $key, $val := .Values.mapstorage.env }}
   {{ $key }}: {{ $val | quote }}
   {{- end }}
+{{- end }}

contrib/helm/templates/mapstorage-ingress.yaml

@@ -1,4 +1,4 @@
-{{- if and (or .Values.ingress.enabled .Values.mapstorage.ingress.enabled) (not .Values.singleDomain) -}}
+{{- if and .Values.mapstorage.enabled (or .Values.ingress.enabled .Values.mapstorage.ingress.enabled) (not .Values.singleDomain) -}}
 {{- $fullName := include "workadventure.fullname" . -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress

contrib/helm/templates/mapstorage-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.mapstorage.persistence.enabled }}
+{{- if and .Values.mapstorage.enabled .Values.mapstorage.persistence.enabled }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:

contrib/helm/templates/mapstorage-secret-env.yaml

@@ -1,10 +1,10 @@
-{{- if include "workadventure.isBooleanText" .Values.mapstorage.env.ENABLE_BASIC_AUTHENTICATION }}
+{{- if and .Values.mapstorage.enabled (include "workadventure.isBooleanText" .Values.mapstorage.env.ENABLE_BASIC_AUTHENTICATION) }}
 {{- $name := .Values.mapstorage.env.AUTHENTICATION_USER | required ".Values.mapstorage.env.AUTHENTICATION_USER is required when .Values.mapstorage.env.ENABLE_BASIC_AUTHENTICATION is set" }}
 {{- $password := .Values.mapstorage.secretEnv.AUTHENTICATION_PASSWORD | required ".Values.mapstorage.secretEnv.AUTHENTICATION_PASSWORD is required when .Values.mapstorage.env.ENABLE_BASIC_AUTHENTICATION is set" }}
 {{- end }}
 
 {{- $bearerAuthentication := "" }}
-{{- if and .Values.mapstorage.env.ENABLE_BEARER_AUTHENTICATION (not .Values.mapstorage.secretEnv.AUTHENTICATION_TOKEN) }}
+{{- if and .Values.mapstorage.enabled .Values.mapstorage.env.ENABLE_BEARER_AUTHENTICATION (not .Values.mapstorage.secretEnv.AUTHENTICATION_TOKEN) }}
   {{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-secret-env-mapstorage" (include "workadventure.fullname" .))) }}
 
   {{- $bearerAuthentication = (randAlpha 32) | b64enc }}
@@ -14,6 +14,7 @@
   {{- end }}
 {{- end }}
 
+{{- if .Values.mapstorage.enabled }}
 ---
 kind: Secret
 apiVersion: v1
@@ -34,3 +35,4 @@ data:
   {{- range $key, $val := .Values.mapstorage.secretEnv }}
   {{ $key }}: {{ $val | default "" | b64enc | quote }}
   {{- end }}
+{{- end }}

contrib/helm/templates/mapstorage-service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.mapstorage.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
   selector:
     {{- include "workadventure.selectorLabels" . | nindent 4 }}
     role: mapstorage
+{{- end }}

contrib/helm/values.yaml

@@ -469,6 +469,7 @@ icon:
 # mapstorage service
 # #########################################################
 mapstorage:
+  enabled: true
   replicaCount: 1
 
   image: