From 4cd0293b8576b68d224821eaf5c60f4d9d317b3b Mon Sep 17 00:00:00 2001
From: TrueCharts-Bot <bot@truecharts.org>
Date: Wed, 23 Nov 2022 20:59:06 +0000
Subject: [PATCH] Commit new Chart releases for TrueCharts

Signed-off-by: TrueCharts-Bot <bot@truecharts.org>
---
 incubator/funkwhale/2.0.1/app-changelog.md    |   9 ----
 .../funkwhale/2.0.1/templates/common.yaml     |   2 -
 .../funkwhale/{2.0.1 => 2.1.0}/CHANGELOG.md   |   0
 .../funkwhale/{2.0.1 => 2.1.0}/Chart.yaml     |   4 +-
 .../funkwhale/{2.0.1 => 2.1.0}/README.md      |   0
 incubator/funkwhale/2.1.0/app-changelog.md    |   9 ++++
 .../funkwhale/{2.0.1 => 2.1.0}/app-readme.md  |   0
 .../{2.0.1 => 2.1.0}/charts/common-11.0.3.tgz | Bin
 .../funkwhale/{2.0.1 => 2.1.0}/ix_values.yaml |  43 +++++++++++-------
 .../funkwhale/{2.0.1 => 2.1.0}/questions.yaml |   0
 .../funkwhale/2.1.0/templates/_secret.tpl     |  21 +++++++++
 .../funkwhale/2.1.0/templates/common.yaml     |   8 ++++
 .../funkwhale/{2.0.1 => 2.1.0}/values.yaml    |   0
 13 files changed, 66 insertions(+), 30 deletions(-)
 delete mode 100644 incubator/funkwhale/2.0.1/app-changelog.md
 delete mode 100644 incubator/funkwhale/2.0.1/templates/common.yaml
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/CHANGELOG.md (100%)
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/Chart.yaml (93%)
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/README.md (100%)
 create mode 100644 incubator/funkwhale/2.1.0/app-changelog.md
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/app-readme.md (100%)
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/charts/common-11.0.3.tgz (100%)
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/ix_values.yaml (60%)
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/questions.yaml (100%)
 create mode 100644 incubator/funkwhale/2.1.0/templates/_secret.tpl
 create mode 100644 incubator/funkwhale/2.1.0/templates/common.yaml
 rename incubator/funkwhale/{2.0.1 => 2.1.0}/values.yaml (100%)

diff --git a/incubator/funkwhale/2.0.1/app-changelog.md b/incubator/funkwhale/2.0.1/app-changelog.md
deleted file mode 100644
index f2cf685826c..00000000000
--- a/incubator/funkwhale/2.0.1/app-changelog.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-## [funkwhale-2.0.1](https://github.com/truecharts/charts/compare/funkwhale-2.0.0...funkwhale-2.0.1) (2022-11-15)
-
-### Chore
-
-- update helm general non-major ([#4463](https://github.com/truecharts/charts/issues/4463))
-  
-  
\ No newline at end of file
diff --git a/incubator/funkwhale/2.0.1/templates/common.yaml b/incubator/funkwhale/2.0.1/templates/common.yaml
deleted file mode 100644
index cbf66c20818..00000000000
--- a/incubator/funkwhale/2.0.1/templates/common.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-{{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
diff --git a/incubator/funkwhale/2.0.1/CHANGELOG.md b/incubator/funkwhale/2.1.0/CHANGELOG.md
similarity index 100%
rename from incubator/funkwhale/2.0.1/CHANGELOG.md
rename to incubator/funkwhale/2.1.0/CHANGELOG.md
diff --git a/incubator/funkwhale/2.0.1/Chart.yaml b/incubator/funkwhale/2.1.0/Chart.yaml
similarity index 93%
rename from incubator/funkwhale/2.0.1/Chart.yaml
rename to incubator/funkwhale/2.1.0/Chart.yaml
index a4ccb1fb92a..e05a60da7b7 100644
--- a/incubator/funkwhale/2.0.1/Chart.yaml
+++ b/incubator/funkwhale/2.1.0/Chart.yaml
@@ -26,6 +26,6 @@ name: funkwhale
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/funkwhale
   - https://funkwhale.audio/
-  - https://hub.docker.com/r/thetarkus/funkwhale/
+  - https://hub.docker.com/r/funkwhale/funkwhale
 type: application
-version: 2.0.1
+version: 2.1.0
diff --git a/incubator/funkwhale/2.0.1/README.md b/incubator/funkwhale/2.1.0/README.md
similarity index 100%
rename from incubator/funkwhale/2.0.1/README.md
rename to incubator/funkwhale/2.1.0/README.md
diff --git a/incubator/funkwhale/2.1.0/app-changelog.md b/incubator/funkwhale/2.1.0/app-changelog.md
new file mode 100644
index 00000000000..6161e6a2828
--- /dev/null
+++ b/incubator/funkwhale/2.1.0/app-changelog.md
@@ -0,0 +1,9 @@
+
+
+## [funkwhale-2.1.0](https://github.com/truecharts/charts/compare/funkwhale-2.0.1...funkwhale-2.1.0) (2022-11-23)
+
+### Feat
+
+- Fix port + update container ([#4744](https://github.com/truecharts/charts/issues/4744))
+  
+  
\ No newline at end of file
diff --git a/incubator/funkwhale/2.0.1/app-readme.md b/incubator/funkwhale/2.1.0/app-readme.md
similarity index 100%
rename from incubator/funkwhale/2.0.1/app-readme.md
rename to incubator/funkwhale/2.1.0/app-readme.md
diff --git a/incubator/funkwhale/2.0.1/charts/common-11.0.3.tgz b/incubator/funkwhale/2.1.0/charts/common-11.0.3.tgz
similarity index 100%
rename from incubator/funkwhale/2.0.1/charts/common-11.0.3.tgz
rename to incubator/funkwhale/2.1.0/charts/common-11.0.3.tgz
diff --git a/incubator/funkwhale/2.0.1/ix_values.yaml b/incubator/funkwhale/2.1.0/ix_values.yaml
similarity index 60%
rename from incubator/funkwhale/2.0.1/ix_values.yaml
rename to incubator/funkwhale/2.1.0/ix_values.yaml
index 10d2c9a8d0b..e26c0540b44 100644
--- a/incubator/funkwhale/2.0.1/ix_values.yaml
+++ b/incubator/funkwhale/2.1.0/ix_values.yaml
@@ -1,10 +1,32 @@
-env:
-  FUNKWHALE_HOSTNAME: yourdomain.funkwhale
-  NESTED_PROXY: "0"
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/funkwhale
-  tag: latest@sha256:ec538fd47441c881b3f06bfffcd164b63779a805ec6d05439dbeb5e8eff52729
+  tag: 1.2.8@sha256:e12c15ebb65102637b507ca0a610bc4a372495fd58bd8a02f2b4d024eff2badd
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+env:
+  DJANGO_SECRET_KEY:
+    secretKeyRef:
+      name: '{{ printf "%s-secret" (include "tc.common.names.fullname" .) }}'
+      key: DJANGO_SECRET_KEY
+  FUNKWHALE_HOSTNAME: yourdomain.funkwhale
+  NESTED_PROXY: "0"
+
+service:
+  main:
+    ports:
+      main:
+        port: 10236
+        protocol: HTTP
+        targetPort: 5000
+
 persistence:
   data:
     enabled: true
@@ -13,19 +35,6 @@ persistence:
     enabled: true
     mountPath: /music
     readOnly: true
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    ports:
-      main:
-        port: 3030
-        protocol: TCP
-        targetPort: 80
 
 portal:
   enabled: true
diff --git a/incubator/funkwhale/2.0.1/questions.yaml b/incubator/funkwhale/2.1.0/questions.yaml
similarity index 100%
rename from incubator/funkwhale/2.0.1/questions.yaml
rename to incubator/funkwhale/2.1.0/questions.yaml
diff --git a/incubator/funkwhale/2.1.0/templates/_secret.tpl b/incubator/funkwhale/2.1.0/templates/_secret.tpl
new file mode 100644
index 00000000000..618074fddbb
--- /dev/null
+++ b/incubator/funkwhale/2.1.0/templates/_secret.tpl
@@ -0,0 +1,21 @@
+{{/* Define the secret */}}
+{{- define "funkwhale.secret" -}}
+
+{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) -}}
+
+---
+
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ $secretName }}
+  labels:
+    {{- include "tc.common.labels" . | nindent 4 }}
+data:
+  {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
+  DJANGO_SECRET_KEY: {{ (index .data "DJANGO_SECRET_KEY") }}
+  {{- else }}
+  DJANGO_SECRET_KEY: {{ randAlphaNum 32 | b64enc }}
+  {{- end }}
+{{- end -}}
diff --git a/incubator/funkwhale/2.1.0/templates/common.yaml b/incubator/funkwhale/2.1.0/templates/common.yaml
new file mode 100644
index 00000000000..066683a70af
--- /dev/null
+++ b/incubator/funkwhale/2.1.0/templates/common.yaml
@@ -0,0 +1,8 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.common.loader.init" . }}
+
+{{/* Render secret */}}
+{{- include "funkwhale.secret" . }}
+
+{{/* Render the templates */}}
+{{ include "tc.common.loader.apply" . }}
diff --git a/incubator/funkwhale/2.0.1/values.yaml b/incubator/funkwhale/2.1.0/values.yaml
similarity index 100%
rename from incubator/funkwhale/2.0.1/values.yaml
rename to incubator/funkwhale/2.1.0/values.yaml