From 0b5049fec140a6875f5aa85fd1ab02edaf71c4de Mon Sep 17 00:00:00 2001
From: LecygneNoir <git@lecygnenoir.info>
Date: Sat, 30 Jul 2022 17:23:29 +0200
Subject: [PATCH] Release v1.4.0, compatibility with k8s 1.19+, no more fixed
 suffix for database

---
 CHANGELOG.md              | 15 +++++++++++++--
 Chart.yaml                |  2 +-
 README.md                 | 10 +++++-----
 templates/deployment.yaml |  2 --
 templates/ingress.yaml    |  9 ++++++---
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 480ffda..013a4f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,19 @@
+# v1.4.0
+
+## Feature
+- Upgrade Ingress template for k8s 1.19+ compatibility
+- Remove fixed database suffix from deployment, please use production.yml to configure if default "_prod" is not sufficient
+
+# v1.3.0
+
+## Feature
+- Bump to peertube v4.0 by default. Warn if you are upgrading for 3.4, see release note for post maj script: https://github.com/Chocobozzz/PeerTube/releases/tag/v4.0.0
+
 # v1.2.1
 
 ## Fix
  - Adjust initialDelaySecond for startupProbe to avoid waiting 5min even if the instance starts quickly
- - Adjust startupProbe port to use 9000 instead of http 
+ - Adjust startupProbe port to use 9000 instead of http
 
 # v1.2.0
 
@@ -24,7 +35,7 @@ Is you used it, configure your production.yml instead for better reliability.
 
 # v1.1.0
 
-## Features  
+## Features
 
 Add a nginx sidecar to use the official Peertube optimisations for Nginx (Fix #2)
 
diff --git a/Chart.yaml b/Chart.yaml
index 801aee3..120c0f1 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "v4.0.0-bullseye"
 description: A Helm chart for Kubernetes
 name: peertube
-version: 1.2.1
+version: 1.4.0
diff --git a/README.md b/README.md
index 52a4b61..b83a673 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly
 
 ---
 
-## Status : WIP
+## Status : WIP bu workable
 
 - [x] Run Peertube and Redis
 - [x] Use pvc to persist data
@@ -12,11 +12,11 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly
 
 ## Before deploying
 
-Currently if you want use persistent volume you need to create persistent volume and persistent volume claim. You may use sample claims from `sample`:  
+Currently if you want use persistent volume you need to create persistent volume and persistent volume claim. You may use sample claims from `sample`:
  - change the storageclass from `ChangeMeStorageClass` to your correct class
  - apply the claim: `kubectl apply -f sample/claim.pvc-pt.yml`
 
-You also need a postgresql server.  
+You also need a postgresql server.
 If you know what you are doing and want to store postgres in Kubernetes, I suggest the excellent [stolon](https://github.com/helm/charts/tree/master/stable/stolon).
 
 ## Installing the chart
@@ -40,5 +40,5 @@ See the sample/values.yml for example of values to use
 
 ## Source
 
-Originated from https://github.com/MikaXII/helm-charts  
-Thanks!
\ No newline at end of file
+Originated from https://github.com/MikaXII/helm-charts
+Thanks!
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index c4694dd..6cb8f9e 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -167,8 +167,6 @@ spec:
               value: {{ .Values.environment.httpsEnabled | quote }}
             - name: PEERTUBE_DB_HOSTNAME
               value: {{ .Values.environment.dbHostname }}
-            - name: PEERTUBE_DB_SUFFIX
-              value: _prod
             - name: PEERTUBE_DB_USERNAME
               value: {{ .Values.environment.dbUser }}
             - name: PEERTUBE_DB_PASSWORD
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
index 39acf42..adb8a2c 100644
--- a/templates/ingress.yaml
+++ b/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "peertube.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,8 +31,11 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: Prefix
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: 9000
   {{- end }}
 {{- end }}