From 8a9ef93126b40bbf3d90cd5e4a8bf867bec441c4 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 14 Jan 2024 04:28:55 +0100
Subject: [PATCH] feat(mastodon): Add proper labels to cronjob pods

---
 charts/mastodon/Chart.yaml                       |  2 +-
 charts/mastodon/README.md                        |  2 +-
 .../mastodon/templates/cronjob-media-remove.yaml |  4 ++++
 .../__snapshot__/98_snapshot_test.yaml.snap      | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml
index 81c21d0f9..24dc000a4 100644
--- a/charts/mastodon/Chart.yaml
+++ b/charts/mastodon/Chart.yaml
@@ -17,7 +17,7 @@ annotations:
     - name: support
       url: https://matrix.to/#/#mastodon-on-kubernetes:shivering-isles.com
 type: application
-version: 9.0.3
+version: 9.1.0
 kubeVersion: ">= 1.23"
 # renovate: image=ghcr.io/mastodon/mastodon
 appVersion: "v4.2.3"
diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md
index 7f647ebc8..514f41dd7 100644
--- a/charts/mastodon/README.md
+++ b/charts/mastodon/README.md
@@ -1,6 +1,6 @@
 # mastodon
 
-![Version: 9.0.3](https://img.shields.io/badge/Version-9.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.2.3](https://img.shields.io/badge/AppVersion-v4.2.3-informational?style=flat-square)
+![Version: 9.1.0](https://img.shields.io/badge/Version-9.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.2.3](https://img.shields.io/badge/AppVersion-v4.2.3-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 
diff --git a/charts/mastodon/templates/cronjob-media-remove.yaml b/charts/mastodon/templates/cronjob-media-remove.yaml
index 9e2354c01..bc5267cf9 100644
--- a/charts/mastodon/templates/cronjob-media-remove.yaml
+++ b/charts/mastodon/templates/cronjob-media-remove.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "mastodon.fullname" . }}-media-remove
   labels:
     {{- include "mastodon.labels" . | nindent 4 }}
+    app.kubernetes.io/component: media-remover
 spec:
   schedule: {{ .Values.mastodon.cron.removeMedia.schedule }}
   jobTemplate:
@@ -12,6 +13,9 @@ spec:
       template:
         metadata:
           name: {{ include "mastodon.fullname" . }}-media-remove
+          labels:
+            {{- include "mastodon.labels" . | nindent 12 }}
+            app.kubernetes.io/component: media-remover
           {{- with .Values.jobAnnotations }}
           annotations:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
index cb1f906cf..6272a1074 100644
--- a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
+++ b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
@@ -38,6 +38,7 @@ should match basic snapshot:
     kind: CronJob
     metadata:
       labels:
+        app.kubernetes.io/component: media-remover
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mastodon
@@ -49,6 +50,13 @@ should match basic snapshot:
         spec:
           template:
             metadata:
+              labels:
+                app.kubernetes.io/component: media-remover
+                app.kubernetes.io/instance: RELEASE-NAME
+                app.kubernetes.io/managed-by: Helm
+                app.kubernetes.io/name: mastodon
+                app.kubernetes.io/version: 4.5.6
+                helm.sh/chart: mastodon-1.2.3
               name: RELEASE-NAME-mastodon-media-remove
             spec:
               affinity:
@@ -938,6 +946,7 @@ should match basic snapshot without dependencies:
     kind: CronJob
     metadata:
       labels:
+        app.kubernetes.io/component: media-remover
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mastodon
@@ -949,6 +958,13 @@ should match basic snapshot without dependencies:
         spec:
           template:
             metadata:
+              labels:
+                app.kubernetes.io/component: media-remover
+                app.kubernetes.io/instance: RELEASE-NAME
+                app.kubernetes.io/managed-by: Helm
+                app.kubernetes.io/name: mastodon
+                app.kubernetes.io/version: 4.5.6
+                helm.sh/chart: mastodon-1.2.3
               name: RELEASE-NAME-mastodon-media-remove
             spec:
               affinity:
-- 
GitLab