Merge branch 'release/v1.6.0'

v1.5.0

CHANGELOG.md

@@ -1,3 +1,28 @@
+# v1.6.0
+
+## Important
+- From Peertube 6.0, [storage directoy for video changes](https://github.com/Chocobozzz/PeerTube/releases/tag/v6.0.0)! This new Chart version includes an init script that move directory from `/data/videos` to `/data/web-videos` before starting peertube (as in k8s, it's very hard to move data in place 😅 ) **but you need** to edit your config file accordingly!
+
+## Features
+- Compatibility with Peertube v6.0.2
+- Use the new production.yaml.new files generated by peertube during upgrade if it exists
+
+# v1.5.1
+
+## Important
+- Add pathType and ingressClassName in values.yml for better support in k8s 1.25+
+
+## Feature
+- Compatibility with Peertube 5.2.1
+
+# v1.5.1
+
+## Important
+- Add pathType and ingressClassName in values.yml for better support in k8s 1.25+
+
+## Feature
+- Compatibility with Peertube 5.2.1
+
 # v1.5.0
 
 ## Important

Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v4.3.0-bullseye"
-description: A Helm chart for Kubernetes
+appVersion: "v6.0.2-bookworm"
+description: A Helm chart to install peertube in kubernetes
 name: peertube
-version: 1.5.0
+version: 1.6.0

scripts/peertube-init.sh

@@ -8,10 +8,19 @@ fi
 # Always copy default and custom env configuration file, in cases new keys were added
 cp /app/config/default.yaml /config
 cp /app/support/docker/production/config/custom-environment-variables.yaml /config
+# From 5.2 peertube upgrade script creates a production.yaml.new containing production.yml config and news mandatory keys, directly usable
+if [ -f "/config/production.yaml.new" ]; then
+    mv /config/production.yaml.new /config/production.yaml
+fi
 # Patch user after the cp
 find /config ! -user peertube -exec chown peertube:peertube {} \;
 
+# Move videos data for Peertube 6.0.0 before starting peertube
+if [ -d "/data/videos" -a ! -d "/data/web-videos" ]; then
+    mv /data/videos /data/web-videos
+fi
+
 # Prepare assets for the Nginx sidecar
 cp -r /app/client/dist/* /assets/
 
-exit 0
+exit 0

templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "peertube.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
+{{- $ingressPathType := .Values.ingress.pathType -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -15,6 +16,7 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
@@ -31,7 +33,7 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
-            pathType: Prefix
+            pathType: {{ $ingressPathType }}
             backend:
               service:
                 name: {{ $fullName }}

values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 
 image:
   repository: chocobozzz/peertube
-  tag: v4.0.0-bullseye
+  tag: v6.0.2-bookworm
   pullPolicy: IfNotPresent
 
 service:
@@ -26,11 +26,12 @@ ports:
 
 ingress:
   enabled: true
+  ingressClassName: haproxy
   annotations:
-    kubernetes.io/ingress.class: haproxy
     kubernetes.io/tls-acme: "true"
     certmanager.k8s.io/cluster-issuer: your-certmanager
   path: /
+  pathType: Prefix
   hosts:
     - peertube.domain.tld
   tls:
@@ -45,10 +46,6 @@ chowncontainer:
   enabled: true
 
 resources:
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
    requests:
     cpu: 3
     memory: 6Gi