From 014389f9af8c6923e03e03f8ec78cd40c16d1cbe Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sun, 27 Mar 2022 16:55:50 +0300
Subject: [PATCH]  fix(chevereto): use 0/1 instead of true/false (#2312)

* fix(chevereto): use 0/1 instead of true/false

* remove envs
---
 charts/incubator/chevereto/Chart.yaml     |  2 +-
 charts/incubator/chevereto/questions.yaml | 10 +++++-----
 charts/incubator/chevereto/values.yaml    | 21 +++++++++++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/charts/incubator/chevereto/Chart.yaml b/charts/incubator/chevereto/Chart.yaml
index 4d8b0898255..978c0a9ccdf 100644
--- a/charts/incubator/chevereto/Chart.yaml
+++ b/charts/incubator/chevereto/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: chevereto
-version: 0.0.29
+version: 0.0.30
 appVersion: "1.6.2"
 description: Chevereto is an image hosting software that allows you to create a beautiful and full-featured image hosting website on your own server.
 type: application
diff --git a/charts/incubator/chevereto/questions.yaml b/charts/incubator/chevereto/questions.yaml
index de70501e47a..3f7f1a5b758 100644
--- a/charts/incubator/chevereto/questions.yaml
+++ b/charts/incubator/chevereto/questions.yaml
@@ -74,24 +74,24 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  - variable: env
+  - variable: chevereto
     group: "Container Configuration"
-    label: "Image Environment"
+    label: "Chevereto Configuration"
     schema:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: CHEVERETO_HTTPS
+        - variable: https
           label: "CHEVERETO_HTTPS"
           schema:
             type: boolean
             default: false
-        - variable: CHEVERETO_DISABLE_UPDATE_HTTP
+        - variable: disable_update_http
           label: "CHEVERETO_DISABLE_UPDATE_HTTP"
           schema:
             type: boolean
             default: true
-        - variable: CHEVERETO_DISABLE_UPDATE_CLI
+        - variable: disable_update_cli
           label: "CHEVERETO_DISABLE_UPDATE_CLI"
           schema:
             type: boolean
diff --git a/charts/incubator/chevereto/values.yaml b/charts/incubator/chevereto/values.yaml
index 7f8c3daed60..8bbe208915e 100644
--- a/charts/incubator/chevereto/values.yaml
+++ b/charts/incubator/chevereto/values.yaml
@@ -17,10 +17,23 @@ env:
   CHEVERETO_DB_USER: "{{ .Values.mariadb.mariadbDatabase }}"
   CHEVERETO_DB_PORT: "3306"
   CHEVERETO_TAG: "free"
-  # User Defined
-  CHEVERETO_HTTPS: false
-  CHEVERETO_DISABLE_UPDATE_HTTP: true
-  CHEVERETO_DISABLE_UPDATE_CLI: true
+
+envFrom:
+  - configMapRef:
+      name: '{{ include "common.names.fullname" . }}-chevereto'
+
+chevereto:
+  https: false
+  disable_update_http: true
+  disable_update_cli: true
+
+configmap:
+  chevereto:
+    enabled: true
+    data:
+      CHEVERETO_HTTPS: "{{ ternary \"1\" \"0\" .Values.chevereto.https }}"
+      CHEVERETO_DISABLE_UPDATE_HTTP: "{{ ternary \"1\" \"0\" .Values.chevereto.disable_update_http }}"
+      CHEVERETO_DISABLE_UPDATE_CLI: "{{ ternary \"1\" \"0\" .Values.chevereto.disable_update_cli }}"
 
 envValueFrom:
   CHEVERETO_DB_HOST: