diff --git a/CHANGELOG.md b/CHANGELOG.md index 013a4f6..d4d1f6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.5.0 + +## Important +- Removed redis from this chart as it's osbolete. You need to install a redis server aside! See README for details. + +## Features: +- Compatibility with peertube v4.3.0 + + # v1.4.0 ## Feature diff --git a/Chart.yaml b/Chart.yaml index 120c0f1..2a92eab 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "v4.0.0-bullseye" +appVersion: "v4.3.0-bullseye" description: A Helm chart for Kubernetes name: peertube -version: 1.4.0 +version: 1.5.0 diff --git a/README.md b/README.md index b83a673..1ab1787 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly --- -## Status : WIP bu workable +## Status : WIP but workable - [x] Run Peertube and Redis - [x] Use pvc to persist data @@ -16,8 +16,21 @@ Currently if you want use persistent volume you need to create persistent volume - 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. -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). +### Postgres +You need a postgresql server. +If you know what you are doing and want to store postgres in Kubernetes, I suggest [postgres-operator](https://access.crunchydata.com/documentation/postgres-operator/5.1.1/) from CrunchyData + +### You also need a redis + +From peertube helm v1.5.0, redis is no more provided inside the chart. Indeed peertube does not handle anymore redis 3.3, so I advice installing and managing redis outside the chart like postgres cluster. + +I suggest using [bitnami redis](https://github.com/bitnami/charts/tree/master/bitnami/redis) with `architecture=standalone` to avoid uneeded slave (Peertube only need master) + +Once installed, use following values to pass needed info to your peertube instance. +``` +redisHostname +redisAuth +``` ## Installing the chart diff --git a/charts/redis-3.3.5.tgz b/charts/redis-3.3.5.tgz deleted file mode 100644 index 52f6d7d..0000000 Binary files a/charts/redis-3.3.5.tgz and /dev/null differ diff --git a/requirements.lock b/requirements.lock deleted file mode 100644 index 58a94e4..0000000 --- a/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: redis - repository: https://kubernetes-charts.storage.googleapis.com - version: 3.3.5 -digest: sha256:bc60370cbce6d02249e972f74489dc20248f8bd3d61d7e031d6e186ff07c42ad -generated: 2018-06-08T16:58:13.072321307+02:00 diff --git a/requirements.yaml b/requirements.yaml deleted file mode 100644 index 0af465b..0000000 --- a/requirements.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# requirements.yaml -dependencies: -- name: redis - version: "3.3.5" - repository: "@stable" diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 6cb8f9e..992e7fc 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -149,7 +149,7 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 300 + initialDelaySeconds: 30 failureThreshold: 3 periodSeconds: 10 {{- end }} @@ -172,7 +172,9 @@ spec: - name: PEERTUBE_DB_PASSWORD value: {{ .Values.environment.dbPassword }} - name: PEERTUBE_REDIS_HOSTNAME - value: {{ .Release.Name }}-{{ .Values.environment.redisHostname }}-master + value: {{ .Values.environment.redisHostname }} + - name: PEERTUBE_REDIS_AUTH + value: {{ .Values.environment.redisAuth }} - name: PEERTUBE_SMTP_USERNAME value: {{ .Values.environment.smtpUser | quote }} - name: PEERTUBE_SMTP_PASSWORD diff --git a/values.yaml b/values.yaml index 86d7087..f7fe1b2 100644 --- a/values.yaml +++ b/values.yaml @@ -86,6 +86,7 @@ environment: dbUser: peertube dbPassword: postgres redisHostname: redis + redisAuth: redispassword smtpUser: peertube@peertube.domain.tld smtpPassword: smtppassword smtpHostname: smtp.peertube.domain.tld @@ -109,15 +110,3 @@ nginxproxy: persistence: enabled: false existingClaim: pvc-nginx-proxy - -redis: - usePassword: false - password: peertube - master: - persistence: - enabled: true - path: /data - # PVC are not handled by helm, you need to create redis volume before deploying helm - persistence: - enabled: true - existingClaim: pvc-redis-prod