fix(flame): cleanup and attempt to enable k8s integration (#3385)

* fix(flame): cleanup

* make k8s integration an option

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

charts/incubator/flame/Chart.yaml

@@ -1,22 +1,16 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Tools-Utilities
-    - Network-Web
 apiVersion: v2
 appVersion: "latest"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 10.4.9
+    version: 10.4.8
 deprecated: false
-description: Flame is self-hosted startpage for your server. Easily manage your apps and bookmarks with built-in editors.
+description: Flame is self-hosted start page for your server. Easily manage your apps and bookmarks with built-in editors.
-home: https://truecharts.org/docs/charts/incubator/flame
+home: https://github.com/truecharts/charts/tree/master/charts/incubator/flame
-icon: https://truecharts.org/img/hotlink-ok/chart-icons/flame.png
+icon: https://truecharts.org/img/chart-icons/flame.png
 keywords:
   - flame
-  - Tools-Utilities
+  - dashboard
-  - Network-Web
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -28,4 +22,8 @@ sources:
   - https://github.com/pawelmalak/flame
   - https://hub.docker.com/r/pawelmalak/flame
 type: application
-version: 0.0.16
+version: 0.0.17
+annotations:
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/catagories: |
+    - utilities

charts/incubator/flame/questions.yaml

@@ -11,6 +11,20 @@ questions:
 # Include{strategy}
 # Include{recreate}
 # Include{controllerExpert}
+  - variable: secretEnv
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: PASSWORD
+          label: 'PASSWORD'
+          description: "PASSWORD"
+          schema:
+            type: string
+            private: true
+            default: ""
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
@@ -18,12 +32,12 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: PASSWORD
+        - variable: enable_integration
-          label: 'PASSWORD'
+          label: "Enable Kubernetes Integration"
-          description: "Container Variable PASSWORD"
+          description: "Defines RBAC, ClusterRole, ClusterRoleBinding and Service Account"
           schema:
-            type: string
+            type: boolean
-            default: "flame_password"
+            default: false
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
@@ -45,9 +59,9 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 5030
+                              default: 10291
                               required: true
-# Include{advancedPortTCP}
+# Include{advancedPortHTTP}
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
@@ -61,7 +75,7 @@ questions:
 # Include{persistenceRoot}
         - variable: data
           label: "data Storage"
-          description: "Container Path appdata"
+          description: "Container Path data"
           schema:
             additional_attrs: true
             type: dict

charts/incubator/flame/templates/_integration.tpl

@@ -0,0 +1,18 @@
+{{- define "flame.integration.serviceAccount" -}}
+main:
+  create: true
+{{- end -}}
+---
+{{- define "flame.integration.rbac" -}}
+main:
+  enabled: true
+  rules:
+    - apiGroups:
+        - "networking.k8s.io"
+      resources:
+        - "ingresses"
+      verbs:
+        - "get"
+        - "list"
+        - "watch"
+{{- end -}}

charts/incubator/flame/templates/common.yaml

@@ -1,2 +1,10 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.common.loader.init" . }}
+
+{{- if .Values.env.enable_integration -}}
+{{- $_ := set .Values "serviceAccount" (include "flame.integration.serviceAccount" . | fromYaml) -}}
+{{- $_ := set .Values "rbac" (include "flame.integration.rbac" . | fromYaml) -}}
+{{- end -}}
+
 {{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.common.loader.apply" . }}

charts/incubator/flame/values.yaml

@@ -1,28 +1,36 @@
-env:
-  PASSWORD: flame_password
 image:
-  pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/flame
-  tag: latest@sha256:1e4cfbb4a7cd8039b8a80106d84c6239852d497556c1c6883f16940234d7e55d
+  pullPolicy: IfNotPresent
-persistence:
+  tag: v2.3.0@sha256:47efacdbe12bb2697889aa1f67be324c70fb4ea2c687164edbc215dc4485e819
-  data:
+
-    enabled: true
-    mountPath: /app/data
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
+
+secretEnv:
+  PASSWORD: flame_password
+
+env:
+  enable_integration: true
+
 service:
   main:
     enabled: true
     ports:
       main:
         enabled: true
-        port: 5030
+        port: 10291
-        protocol: TCP
+        protocol: HTTP
         targetPort: 5005
 
+persistence:
+  data:
+    enabled: true
+    mountPath: /app/data
+
 portal:
   enabled: true