From 1728fbaa35999d03647d712bbae91821ce408dee Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 31 Jul 2023 08:07:57 +0000 Subject: [PATCH 01/14] Update elasticsearch Docker tag to v19.10.6 --- charts/mastodon/Chart.lock | 6 +++--- charts/mastodon/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/mastodon/Chart.lock b/charts/mastodon/Chart.lock index 492b0a8..0f2cceb 100644 --- a/charts/mastodon/Chart.lock +++ b/charts/mastodon/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 12.6.0 - name: elasticsearch repository: oci://registry-1.docker.io/bitnamicharts - version: 19.10.1 + version: 19.10.6 - name: redis repository: oci://registry-1.docker.io/bitnamicharts version: 17.11.6 -digest: sha256:6969e0aaa14e4f21e59c0b1c5e9d5a723f321d75703065a6c1a540026f4f8646 -generated: "2023-07-02T12:00:33.427253+02:00" +digest: sha256:7e8f43054d7a82be728a77702c9bcf577b55037a94b6bf05598fde2549dc8e8e +generated: "2023-07-31T08:07:55.049559427Z" diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index 87b29a2..b5c4ad4 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -28,7 +28,7 @@ dependencies: repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: elasticsearch - version: 19.10.1 + version: 19.10.6 repository: oci://registry-1.docker.io/bitnamicharts condition: elasticsearch.enabled - name: redis From 428cb94730bfc59ddeb84bfb1c63262961af8244 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Mon, 7 Aug 2023 15:55:00 +0200 Subject: [PATCH 02/14] Update Chart.yaml - make renovate update the chart version --- charts/mastodon/Chart.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index 87b29a2..9d08bcc 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -17,9 +17,7 @@ type: application # Versions are expected to follow Semantic Versioning (https://semver.org/) version: 4.1.0 -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. +# renovate: image=ghcr.io/mastodon/mastodon appVersion: v4.1.4 dependencies: From d69a985b6134a5c9c9688ed99a9986b509df69be Mon Sep 17 00:00:00 2001 From: JesseBot Date: Mon, 7 Aug 2023 15:56:47 +0200 Subject: [PATCH 03/14] Update renovate.json --- .github/renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index a8a1b20..bccaf31 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,4 +2,13 @@ "repositories": [ "jessebot/mastodon-helm-chart" ] + "regexManagers": [ + { + "datasourceTemplate": "docker", + "fileMatch": ["(^|/)Chart\\.yaml$"], + "matchStrings": [ + "#\\s?renovate: image=(?.*?)\\s?appVersion:\\s?\\\"?(?[\\w+\\.\\-]*)\"" + ] + } + ] } From 0a1bb29ee675433f7a862e02af162d7da894aa82 Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 7 Aug 2023 18:01:53 +0200 Subject: [PATCH 04/14] fix missing comma for renovate.json --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index bccaf31..2eb070f 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,7 +1,7 @@ { "repositories": [ "jessebot/mastodon-helm-chart" - ] + ], "regexManagers": [ { "datasourceTemplate": "docker", From 3957a984177311e1dcc7aa4d7dbbebc3f555dd08 Mon Sep 17 00:00:00 2001 From: jessebot Date: Wed, 9 Aug 2023 08:20:27 +0200 Subject: [PATCH 05/14] update renovate to use config.js and bump helm chart version going forward --- .github/config.js | 41 +++++++++++++++++++++++++++++++++ .github/renovate.json | 14 ----------- .github/workflows/renovate.yaml | 2 +- 3 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 .github/config.js delete mode 100644 .github/renovate.json diff --git a/.github/config.js b/.github/config.js new file mode 100644 index 0000000..e9bd3b4 --- /dev/null +++ b/.github/config.js @@ -0,0 +1,41 @@ +module.exports = { + branchPrefix: 'test-renovate/', + username: 'renovate-release', + gitAuthor: 'Renovate Bot ', + platform: 'github', + includeForks: true, + dryRun: 'full', + repositories: ['jessebot/mastodon-helm-chart'], + extends: ['config:base'], + allowPostUpgradeCommandTemplating: true, + allowedPostUpgradeCommands: ['^.*'], + regexManagers: [ + { + fileMatch: ['(^|/)Chart\\.yaml$'], + matchStrings: [ + '#\\s?renovate: image=(?.*?)\\s?appVersion:\\s?\\"?(?[\\w+\\.\\-]*)', + ], + datasourceTemplate: 'docker', + }, + ], + packageRules: [ + { + matchManagers: ['helm-requirements', 'helm-values', 'regex'], + postUpgradeTasks: { + commands: [ + `version=$(grep '^version:' {{{parentDir}}}/Chart.yaml | awk '{print $2}') + major=$(echo $version | cut -d. -f1) + minor=$(echo $version | cut -d. -f2) + patch=$(echo $version | cut -d. -f3) + minor=$(expr $minor + 1) + echo "Replacing $version with $major.$minor.$patch" + sed -i "s/^version:.*/version: $\{major\}.$\{minor\}.$\{patch\}/g" {{{parentDir}}}/Chart.yaml + cat {{{parentDir}}}/Chart.yaml + `, + ], + }, + fileFilters: ['**/Chart.yaml'], + executionMode: 'branch', + }, + ], +}; diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index 2eb070f..0000000 --- a/.github/renovate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "repositories": [ - "jessebot/mastodon-helm-chart" - ], - "regexManagers": [ - { - "datasourceTemplate": "docker", - "fileMatch": ["(^|/)Chart\\.yaml$"], - "matchStrings": [ - "#\\s?renovate: image=(?.*?)\\s?appVersion:\\s?\\\"?(?[\\w+\\.\\-]*)\"" - ] - } - ] -} diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 3f4e153..77ce572 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -14,4 +14,4 @@ jobs: uses: renovatebot/github-action@v39.0.1 with: token: ${{ secrets.RENOVATE_TOKEN }} - configurationFile: .github/renovate.json + configurationFile: .github/config.js From 23e68357806b69858a8054580a5332ab67e4f058 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 9 Aug 2023 08:23:06 +0200 Subject: [PATCH 06/14] Update README.md - add release badge to readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74ede9c..bbff27c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Introduction +# Mastodon Helm Chart + This is a fork of the official mastodon helm chart for installing Mastodon on a Kubernetes cluster. I'll maintain this at least till some of the security features PRs are merged in the upstream repo. The basic usage is: From d54fef0351eb29bf0a7c5eb0e2be4606a3b90f48 Mon Sep 17 00:00:00 2001 From: jessebot Date: Wed, 9 Aug 2023 08:24:52 +0200 Subject: [PATCH 07/14] bump chart version --- charts/mastodon/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index b5c4ad4..66f740b 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 4.1.0 +version: 4.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 959e57cc966315b2984433f2c710e17ff4e9c575 Mon Sep 17 00:00:00 2001 From: jessebot Date: Wed, 9 Aug 2023 08:25:13 +0200 Subject: [PATCH 08/14] update readme --- charts/mastodon/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md index 77bf4e1..b1d6deb 100644 --- a/charts/mastodon/README.md +++ b/charts/mastodon/README.md @@ -1,6 +1,6 @@ # mastodon -![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.1.4](https://img.shields.io/badge/AppVersion-v4.1.4-informational?style=flat-square) +![Version: 4.2.0](https://img.shields.io/badge/Version-4.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.1.4](https://img.shields.io/badge/AppVersion-v4.1.4-informational?style=flat-square) Mastodon is a free, open-source social network server based on ActivityPub. @@ -8,7 +8,7 @@ Mastodon is a free, open-source social network server based on ActivityPub. | Repository | Name | Version | |------------|------|---------| -| oci://registry-1.docker.io/bitnamicharts | elasticsearch | 19.10.1 | +| oci://registry-1.docker.io/bitnamicharts | elasticsearch | 19.10.6 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.6.0 | | oci://registry-1.docker.io/bitnamicharts | redis | 17.11.6 | From 99aa06d4daa27712360d25cf1e5e1bbb7579060f Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 9 Aug 2023 08:29:05 +0200 Subject: [PATCH 09/14] Update README.md - try to add official callout --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bbff27c..395bf07 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ This is a fork of the official mastodon helm chart for installing Mastodon on a This chart is tested with k8s 1.26+ and helm 3.6.0+. -⚠️ I just became aware of the bitnami mastodon chart [here](https://github.com/bitnami/charts/tree/main/bitnami/mastodon) so I may publicly archive this repo in the near future. Feel free to take what you need though :) +[!Note] +> I just became aware of the bitnami mastodon chart [here](https://github.com/bitnami/charts/tree/main/bitnami/mastodon) so I may publicly archive this repo in the near future. Feel free to take what you need though :) ## Known caveats for this chart Currently in chart version `4.1.0`, you need to run postgresql and redis helm charts independently of this one. This is because there's a helm hook job called db-migrate that I can't figure out how to make run after the dependency charts are fully installed, but before everything else. If you know the answer to this, please open an issue/pr here and let me know! From 6b454163a54876585374d6b2157d79177589d613 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 9 Aug 2023 08:29:44 +0200 Subject: [PATCH 10/14] Update README.md - fix callout --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 395bf07..bbc766a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This is a fork of the official mastodon helm chart for installing Mastodon on a This chart is tested with k8s 1.26+ and helm 3.6.0+. -[!Note] +> [!Note] > I just became aware of the bitnami mastodon chart [here](https://github.com/bitnami/charts/tree/main/bitnami/mastodon) so I may publicly archive this repo in the near future. Feel free to take what you need though :) ## Known caveats for this chart From 1759fe7fbe37c5856d52ad8554068780d002dc63 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 9 Aug 2023 09:15:01 +0200 Subject: [PATCH 11/14] Update config.js - change dryrun to null --- .github/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/config.js b/.github/config.js index e9bd3b4..a4ec97f 100644 --- a/.github/config.js +++ b/.github/config.js @@ -4,7 +4,7 @@ module.exports = { gitAuthor: 'Renovate Bot ', platform: 'github', includeForks: true, - dryRun: 'full', + dryRun: 'null', repositories: ['jessebot/mastodon-helm-chart'], extends: ['config:base'], allowPostUpgradeCommandTemplating: true, From ffc1637aeb10edfcb54cd364a45b7b5061229443 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 9 Aug 2023 09:41:40 +0200 Subject: [PATCH 12/14] Update release.yml - fix release to only run on charts path --- .github/workflows/release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7460f98..e421b2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,11 +5,8 @@ on: push: branches: - main - paths-ignore: - - '.github/**' - - 'charts/**/README.md' - - 'LICENSE' - - 'README.md' + paths: + - 'charts/**' jobs: release: From fb51e318c550915128ee60f84d4ec2ab89fcc727 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Fri, 11 Aug 2023 11:43:30 +0200 Subject: [PATCH 13/14] Update values.yaml - update reference of master to main for bitnami docs --- charts/mastodon/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/mastodon/values.yaml b/charts/mastodon/values.yaml index 788e351..4f50535 100644 --- a/charts/mastodon/values.yaml +++ b/charts/mastodon/values.yaml @@ -248,7 +248,7 @@ ingress: hosts: - mastodon.local -# -- https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters +# -- https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch#parameters elasticsearch: # `false` will disable full-text search # @@ -261,7 +261,7 @@ elasticsearch: image: tag: 7 -# https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters +# https://github.com/bitnami/charts/tree/main/bitnami/postgresql#parameters postgresql: # -- disable if you want to use an existing db; in which case the values below # must match those of that external postgres instance @@ -273,7 +273,7 @@ postgresql: username: mastodon # you must set a password; the password generated by the postgresql chart will # be rotated on each upgrade: - # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade + # https://github.com/bitnami/charts/tree/main/bitnami/postgresql#upgrade password: "" # Set the password for the "postgres" admin user # set this to the same value as above if you've previously installed @@ -283,7 +283,7 @@ postgresql: # with a key of password set to the password you want existingSecret: "" -# https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters +# https://github.com/bitnami/charts/tree/main/bitnami/redis#parameters redis: # disable if you want to use an existing redis instance; in which case the # values below must match those of that external redis instance From 2e77279185b2f9c7cd1472dd7f9c7abcc2a3489c Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 6 Sep 2023 09:20:42 +0200 Subject: [PATCH 14/14] Update renovate.yaml - bump github action to 39.0.5 --- .github/workflows/renovate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 77ce572..78f87db 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -11,7 +11,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Self-hosted Renovate - uses: renovatebot/github-action@v39.0.1 + uses: renovatebot/github-action@v39.0.5 with: token: ${{ secrets.RENOVATE_TOKEN }} configurationFile: .github/config.js