Fixed issue with boolean values in Rancher 2.5

charts/edemocracia/v0.4.0/questions.yaml

@@ -164,28 +164,19 @@ questions:
   default: "True"
   description: "Habilitar o discourse (Expressão)?"
   label: "Usar o Discourse?"
-  type: enum
+  type: boolean
   group: Avançado
-  options:
-    - "True"
-    - "False"
 
 - variable: wikilegis.enabled
   default: "True"
   description: "Habilitar o Wikilegis?"
   label: "Usar o Wikilegis?"
-  type: enum
+  type: boolean
   group: Avançado
-  options:
-    - "True"
-    - "False"
 
 - variable: audiencias.enabled
   default: "True"
   description: "Habilitar o Audiências Interativas?"
   label: "Usar o Audiências?"
-  type: enum
+  type: boolean
   group: Avançado
-  options:
-    - "True"
-    - "False"

charts/edemocracia/v0.4.0/templates/audiencias-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.audiencias.enabled "True" }}
+{{- if .Values.audiencias.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/audienciasweb-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.audiencias.enabled "True" }}
+{{- if .Values.audiencias.enabled }}
 {{- $edemoUrl := .Values.edemocracia.hostname -}}
 apiVersion: apps/v1
 kind: Deployment

charts/edemocracia/v0.4.0/templates/audienciasweb-service.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.audiencias.enabled "True" }}
+{{- if .Values.audiencias.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

charts/edemocracia/v0.4.0/templates/audienciasworker-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.audiencias.enabled "True" }}
+{{- if .Values.audiencias.enabled }}
 {{- $edemoUrl := .Values.edemocracia.hostname -}}
 apiVersion: apps/v1
 kind: Deployment

charts/edemocracia/v0.4.0/templates/discourse-assets-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/discourse-cache-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/discourse-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 {{- $edemoUrl := .Values.edemocracia.hostname -}}
 apiVersion: apps/v1
 kind: Deployment

charts/edemocracia/v0.4.0/templates/discourse-img-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/discourse-js-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/discourse-service.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.discourse.enabled "True" }}
+{{- if .Values.discourse.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

charts/edemocracia/v0.4.0/templates/edemocracia-deployment.yaml

@@ -52,7 +52,11 @@ spec:
             - name: AUDIENCIAS_API_KEY
               value: {{ .Values.edemocracia.apikey | quote }}
             - name: AUDIENCIAS_ENABLED
-              value: {{ .Values.audiencias.enabled | quote }}
+              {{- if .Values.audiencias.enabled }}
+              value: "True"
+              {{- else }}
+              value: "False"
+              {{- end }}
             - name: AUDIENCIAS_UPSTREAM
               value: http://audienciasweb:8000/audiencias
             - name: DATABASE_ENGINE
@@ -72,12 +76,16 @@ spec:
             - name: DEFAULT_FROM_EMAIL
               value: '"Portal e-Democracia" <{{ .Values.edemocracia.admin.email }}>'
             - name: DISCOURSE_ENABLED
-              value: {{ .Values.discourse.enabled | quote }}
+              {{- if .Values.discourse.enabled }}
+              value: "True"
+              {{- else }}
+              value: "False"
+              {{- end }}
             - name: DISCOURSE_SSO_SECRET
               value: {{ .Values.discourse.sso.secret | quote }}
             # Workaround for a bug in runserver-production script, which does not check for DISCOURSE_ENABLED variable
             - name: DISCOURSE_UPSTREAM
-              {{- if eq .Values.discourse.enabled "True" }}
+              {{- if .Values.discourse.enabled }}
               value: http://discourse:8080/expressao
               {{- else }}
               value: "--version"
@@ -123,7 +131,11 @@ spec:
             - name: WIKILEGIS_API_URL
               value: /api/v1/
             - name: WIKILEGIS_ENABLED
-              value: {{ .Values.wikilegis.enabled | quote }}
+              {{- if .Values.wikilegis.enabled }}
+              value: "True"
+              {{- else }}
+              value: "False"
+              {{- end }}
             - name: WIKILEGIS_UPSTREAM
               value: http://wikilegis:8000
           resources:

charts/edemocracia/v0.4.0/templates/nginx-deployment.yaml

@@ -49,15 +49,15 @@ spec:
           volumeMounts:
             - mountPath: /var/labhacker/edemocracia/src/public/
               name: {{ include "edemocracia.fullname" . }}-edemocracia
-            {{- if eq .Values.wikilegis.enabled "True" }}
+            {{- if .Values.wikilegis.enabled }}
             - mountPath: /var/labhacker/wikilegis/wikilegis/public/
               name: {{ include "edemocracia.fullname" . }}-wikilegis
             {{- end }}
-            {{- if eq .Values.audiencias.enabled "True" }}
+            {{- if .Values.audiencias.enabled }}
             - mountPath: /var/labhacker/audiencias/public/
               name: {{ include "edemocracia.fullname" . }}-audiencias
             {{- end }}
-            {{- if eq .Values.discourse.enabled "True" }}
+            {{- if .Values.discourse.enabled }}
             - mountPath: /var/www/discourse/public/assets/
               name: {{ include "edemocracia.fullname" . }}-discourse-assets
             - mountPath: /var/www/discourse/public/javascripts/
@@ -73,17 +73,17 @@ spec:
         - name: {{ include "edemocracia.fullname" . }}-edemocracia
           persistentVolumeClaim:
             claimName: {{ include "edemocracia.fullname" . }}-edemocracia
-        {{- if eq .Values.wikilegis.enabled "True" }}
+        {{- if .Values.wikilegis.enabled }}
         - name: {{ include "edemocracia.fullname" . }}-wikilegis
           persistentVolumeClaim:
             claimName: {{ include "edemocracia.fullname" . }}-wikilegis
         {{- end }}
-        {{- if eq .Values.audiencias.enabled "True" }}
+        {{- if .Values.audiencias.enabled }}
         - name: {{ include "edemocracia.fullname" . }}-audiencias
           persistentVolumeClaim:
             claimName: {{ include "edemocracia.fullname" . }}-audiencias
         {{- end }}
-        {{- if eq .Values.discourse.enabled "True" }}
+        {{- if .Values.discourse.enabled }}
         - name: {{ include "edemocracia.fullname" . }}-discourse-assets
           persistentVolumeClaim:
             claimName: {{ include "edemocracia.fullname" . }}-discourse-assets

charts/edemocracia/v0.4.0/templates/wikilegis-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.wikilegis.enabled "True" }}
+{{- if .Values.wikilegis.enabled }}
 {{- $edemoUrl := .Values.edemocracia.hostname -}}
 apiVersion: apps/v1
 kind: Deployment

charts/edemocracia/v0.4.0/templates/wikilegis-pvc.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.wikilegis.enabled "True" }}
+{{- if .Values.wikilegis.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

charts/edemocracia/v0.4.0/templates/wikilegis-service.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.wikilegis.enabled "True" }}
+{{- if .Values.wikilegis.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

charts/edemocracia/v0.4.0/values.yaml

@@ -19,7 +19,7 @@ nginx:
       memory: 10Mi
 
 discourse:
-  enabled: "True"
+  enabled: true
   image:
     repository: labhackercd/discourse-docker
     tag: 2.0.20180703
@@ -42,7 +42,7 @@ discourse:
      memory: 650Mi
 
 wikilegis:
-  enabled: "True"
+  enabled: true
   image:
     repository: labhackercd/wikilegis
     tag: 2.3.0
@@ -105,7 +105,7 @@ edemocracia:
       memory: 800Mi
 
 audiencias:
-  enabled: "True"
+  enabled: true
   image:
     repository: labhackercd/audiencias-publicas
     tag: 3.3.1