minds/templates/configMap.yaml

@@ -613,26 +613,7 @@ data:
         # or quoted strings
         # '"canary"' | '"admin"'
         $CONFIG->set('features', [
-            'blockchain_creditcard' => {{ .Values.features.blockchain_creditcard | default false }},
-            'suggested-users' => {{ .Values.features.suggested_users | default false }},
-            'helpdesk' => {{ .Values.features.helpdesk | default false }},
-            'top-feeds' => {{ .Values.features.top_feeds | default false }},
-            'es-feeds' => {{ .Values.features.es_feeds | default false }},
-            'cassandra-notifications' => {{ .Values.features.cassandra_notifications | default false }},
-            'allow-comments-toggle' => {{ .Values.features.allow_comments_toggle | default false }},
-            'permissions' => {{ .Values.features.permissions | default false }},
-            'wire-multi-currency' => {{ .Values.features.wire_multi_currency | default false }},
-            'dark-mode' => {{ .Values.features.dark_mode | default false }},
-            'pro' => {{ .Values.features.pro | default false }},
-            'post-scheduler' => {{ .Values.features.post_scheduler | default false }},
-            'webtorrent' => {{ .Values.features.webtorrent | default false }},
-            'top-feeds-by-age' => {{ .Values.features.top_feeds_by_age | default false }},
-            'media-modal' => true,
-            'psr7-router' => {{ .Values.features.psr7_router | default false }},
-            'homepage-december-2019' => {{ .Values.features.homepage_december_2019 | default true }},
-            'onboarding-december-2019' => {{ .Values.features.onboarding_december_2019 | default true }},
-            'register_pages-december-2019' => {{ .Values.features.register_pages_december_2019 | default true }},
-            'modal-pager' => {{ .Values.features.modal_pager | default true }},
+            /* Superseded by GitLab Feature Flags and environment variables */
         ]);
 
         $CONFIG->set('pro', [

minds/templates/deployment-app.yaml

@@ -41,6 +41,9 @@ spec:
             timeoutSeconds: 5
           resources:
             {{- toYaml .Values.phpfpm.resources | nindent 12 }}
+          env:
+            - name: MINDS_ENV
+              value: {{ .Values.env | default "sandbox" }}
           volumeMounts:
             - name: front
               mountPath: /var/www/Minds/front
@@ -65,6 +68,9 @@ spec:
               protocol: TCP
           resources:
             {{- toYaml .Values.nginx.resources | nindent 12 }}
+          env:
+            - name: MINDS_ENV
+              value: {{ .Values.env | default "sandbox" }}
           volumeMounts:
             - name: front
               mountPath: /var/www/Minds/front

minds/templates/deployment-runners.yaml

@@ -28,6 +28,9 @@ spec:
           imagePullPolicy: {{ .Values.runners.image.pullPolicy }}
           resources:
             {{- toYaml .Values.runners.resources | nindent 12 }}
+          env:
+            - name: MINDS_ENV
+              value: {{ .Values.env | default "sandbox" }}
           volumeMounts:
             - name: settings
               mountPath: /var/www/Minds/engine/settings.php

minds/templates/deployment-sockets.yaml

@@ -36,6 +36,8 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 5
           env:
+            - name: MINDS_ENV
+              value: {{ .Values.env | default "sandbox" }}
             - name: PORT
               value: "8010"
             - name: REDIS_HOST

minds/values.yaml

@@ -99,6 +99,8 @@ front:
 nameOverride: ""
 fullnameOverride: ""
 
+env: sandbox
+
 # Ensure there is a trailing slash on each of these variables
 cdnUrl: /
 cdnAssetsUrl: /en/