refactor(charts): BREAKING CHANGE (#2836)

* Update Apps with new Common version

* Patch with the secret fixes from common

* fix amd

charts/stable/loki/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "2.5.0"
 dependencies:
 - name: common
   repository: https://library-charts.truecharts.org
-  version: 9.3.24
+  version: 10.0.8
 - name: "promtail"
   condition: promtail.enabled
   repository: https://charts.truecharts.org
@@ -23,7 +23,7 @@ name: loki
 sources:
   - https://github.com/grafana/loki
 type: application
-version: 3.0.22
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - logs

charts/stable/loki/SCALE/migrations/migrate

@@ -0,0 +1,21 @@
+#!/usr/bin/python3
+import json
+import os
+import sys
+
+
+def migrate(values):
+    values.update({
+        **({'secretEnv': values['secret']} if values.get('secret') else {}),
+        **({'secret': {}} if values.get('secret'))
+    })
+    return values
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], 'r') as f:
+            print(json.dumps(migrate(json.loads(f.read()))))

charts/stable/loki/templates/common.yaml

@@ -1 +1 @@
-{{ include "common.all" . }}
+{{ include "tc.common.loader.all" . }}

charts/stable/loki/templates/configmap-alert.yaml

@@ -1,17 +0,0 @@
-{{- if gt (len .Values.alerting_groups) 0 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  annotations:
-  {{- with .Values.annotations }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-  {{ include "common.names.fullname" . }}-alerting-rules.yaml: |-
-    groups:
-    {{- toYaml .Values.alerting_groups | nindent 6 }}
-{{- end }}

charts/stable/loki/templates/secret.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.names.fullname" . -}}-config
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  annotations:
-  {{- with .Values.annotations }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-  loki.yaml: {{ tpl (toYaml .Values.config) . | b64enc}}

charts/stable/loki/values.yaml

@@ -27,6 +27,23 @@ controller:
 args:
   - "-config.file=/etc/loki/loki.yaml"
 
+## TODO add alertinggroups support like this
+# configmap:
+#   alerting:
+#     enabled: true
+#     data:
+#       '{{ include "common.names.fullname" . }}-alerting-rules.yaml': |-
+#       {{- if gt (len .Values.alerting_groups) 0 }}
+#           groups:
+#           {{- toYaml .Values.alerting_groups | nindent 6 }}
+#       {{- end }}
+
+secret:
+  config:
+    enabled: true
+    data:
+      loki.yaml: '{{ tpl (toYaml .Values.config) . }}'
+
 service:
   main:
     ports:
@@ -130,7 +147,7 @@ persistence:
     enabled: true
     type: secret
     # -- Specify the name of the configmap object to be mounted
-    objectName: '{{ include "common.names.fullname" . -}}-config'
+    objectName: '{{ include "tc.common.names.fullname" . -}}-config'
     # -- Where to mount the volume in the main container.
     mountPath: "/etc/loki"