Merge branch 'upgrade-v4-3-0' into various-work

.github/workflows/test-chart.yml

@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   lint-templates:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v3
@@ -53,7 +53,7 @@ jobs:
   # basic configuration can be used to successfully startup mastodon.
   #
   test-install:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 15
 
     strategy:
@@ -75,7 +75,7 @@ jobs:
           # available for use in the templates, currently we need v3.6.0 or
           # higher.
           #
-          - k3s-channel: v1.21
+          - k3s-channel: v1.28
             helm-version: v3.8.0
 
     env:
@@ -109,7 +109,7 @@ jobs:
         run: |
           helm install mastodon . \
               --values dev-values.yaml \
-              --timeout 10m
+              --timeout 15m
 
       # This actions provides a report about the state of the k8s cluster,
       # providing logs etc on anything that has failed and workloads marked as
@@ -125,7 +125,6 @@ jobs:
             deploy/mastodon-sidekiq
             deploy/mastodon-streaming
             deploy/mastodon-web
-            job/mastodon-assets-precompile
             job/mastodon-chewy-upgrade
             job/mastodon-create-admin
             job/mastodon-db-migrate

.gitignore

@@ -1 +1,2 @@
 charts/
+.DS_Store

Chart.yaml

@@ -15,12 +15,12 @@ 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: 5.5.2
+version: 6.0.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.
-appVersion: "v4.2.13"
+appVersion: "v4.3.3"
 
 dependencies:
   - name: elasticsearch

templates/deployment-streaming.yaml

@@ -70,7 +70,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ coalesce .Values.mastodon.streaming.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
+          image: "{{ .Values.mastodon.streaming.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - node

values.yaml

@@ -6,7 +6,7 @@ image:
   # built from the most recent commit
   #
   # tag: latest
-  tag: null
+  tag: ""
   # use `Always` when using `latest` tag
   pullPolicy: IfNotPresent
 
@@ -26,8 +26,6 @@ mastodon:
   hooks:
     dbMigrate:
       enabled: true
-    assetsPrecompile:
-      enabled: true
     deploySearch:
       enabled: false
       concurrency: 5
@@ -282,8 +280,10 @@ mastodon:
     existingSecret:
   streaming:
     image:
-      repository:
-      tag:
+      # streaming image split in Mastodon v4.3.0
+      repository: ghcr.io/mastodon/mastodon-streaming
+      # other options: `latest` for the latest release or `edge` for most recent commit
+      tag: ""
     port: 4000
     # -- this should be set manually since os.cpus() returns the number of CPUs on
     # the node running the pod, which is unrelated to the resources allocated to