From dafec184dcd1c57e48f617306d5f345d61a40fd2 Mon Sep 17 00:00:00 2001 From: Nikita Weinreich <67778696+nikitaweinreich@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:09:36 +0200 Subject: [PATCH] [bitnami/matomo] add serviceAccountName parameter to CronJob pods (#29182) --- bitnami/matomo/CHANGELOG.md | 8 ++++++-- bitnami/matomo/Chart.yaml | 2 +- bitnami/matomo/README.md | 4 ++++ bitnami/matomo/templates/cronjob.yaml | 8 ++++++++ bitnami/matomo/values.yaml | 12 ++++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md index 09d14b6c2f5cac..a7cac8131e6873 100644 --- a/bitnami/matomo/CHANGELOG.md +++ b/bitnami/matomo/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 8.0.10 (2024-08-22) +## 8.0.11 (2024-09-04) -* [bitnami/matomo] Release 8.0.10 ([#28972](https://github.com/bitnami/charts/pull/28972)) +* [bitnami/matomo] add serviceAccountName parameter to CronJob pods ([#29182](https://github.com/bitnami/charts/pull/29182)) + +## 8.0.10 (2024-08-22) + +* [bitnami/matomo] Release 8.0.10 (#28972) ([890f055](https://github.com/bitnami/charts/commit/890f055a0c00ef6889c34e25108ecab0ab2c86e3)), closes [#28972](https://github.com/bitnami/charts/issues/28972) ## 8.0.9 (2024-08-15) diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml index fc4fa3bf4a5a48..82f98e0dc49091 100644 --- a/bitnami/matomo/Chart.yaml +++ b/bitnami/matomo/Chart.yaml @@ -39,4 +39,4 @@ maintainers: name: matomo sources: - https://github.com/bitnami/charts/tree/main/bitnami/matomo -version: 8.0.10 +version: 8.0.11 diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index bea449a772e18f..6531028b674747 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -381,6 +381,8 @@ helm install my-release --set persistence.existingClaim=PVC_NAME oci://REGISTRY_ | -------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------- | | `cronjobs.taskScheduler.enabled` | Whether to enable scheduled mail-to-task CronJob | `true` | | `cronjobs.taskScheduler.schedule` | Kubernetes CronJob schedule | `*/5 * * * *` | +| `cronjobs.taskScheduler.serviceAccountName` | Attach serviceAccountName to the pod of the CronJob | `""` | +| `cronjobs.taskScheduler.automountServiceAccountToken` | Mount Service Account token in pod of the CronJob | `true` | | `cronjobs.taskScheduler.suspend` | Whether to create suspended CronJob | `false` | | `cronjobs.taskScheduler.affinity` | Affinity for CronJob pod assignment | `{}` | | `cronjobs.taskScheduler.nodeSelector` | Node labels for CronJob pod assignment. Evaluated as a template. | `{}` | @@ -410,6 +412,8 @@ helm install my-release --set persistence.existingClaim=PVC_NAME oci://REGISTRY_ | `cronjobs.taskScheduler.extraEnvVars` | Extra environment variables for the taskScheduler CronJob | `[]` | | `cronjobs.archive.enabled` | Whether to enable scheduled mail-to-task CronJob | `true` | | `cronjobs.archive.schedule` | Kubernetes CronJob schedule | `*/5 * * * *` | +| `cronjobs.archive.serviceAccountName` | Attach serviceAccountName to the pod of the CronJob | `""` | +| `cronjobs.archive.automountServiceAccountToken` | Mount Service Account token in pod of the CronJob | `true` | | `cronjobs.archive.suspend` | Whether to create suspended CronJob | `false` | | `cronjobs.archive.affinity` | Affinity for CronJob pod assignment | `{}` | | `cronjobs.archive.tolerations` | Tolerations for CronJob pod assignment | `[]` | diff --git a/bitnami/matomo/templates/cronjob.yaml b/bitnami/matomo/templates/cronjob.yaml index 42bc7bc57dc7cb..a41d7444dc0fba 100644 --- a/bitnami/matomo/templates/cronjob.yaml +++ b/bitnami/matomo/templates/cronjob.yaml @@ -33,6 +33,10 @@ spec: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.cronjobs.archive.podAnnotations "context" $ ) | nindent 12 }} {{- end }} spec: + {{- if .Values.cronjobs.archive.serviceAccountName }} + serviceAccountName: {{ .Values.cronjobs.archive.serviceAccountName | quote }} + {{- end }} + automountServiceAccountToken: {{ .Values.cronjobs.archive.automountServiceAccountToken }} {{- include "matomo.imagePullSecrets" . | nindent 10 }} restartPolicy: OnFailure {{- if .Values.cronjobs.archive.affinity }} @@ -205,6 +209,10 @@ spec: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.cronjobs.taskScheduler.podAnnotations "context" $ ) | nindent 12 }} {{- end }} spec: + {{- if .Values.cronjobs.taskScheduler.serviceAccountName }} + serviceAccountName: {{ .Values.cronjobs.taskScheduler.serviceAccountName | quote }} + {{- end }} + automountServiceAccountToken: {{ .Values.cronjobs.taskScheduler.automountServiceAccountToken }} {{- include "matomo.imagePullSecrets" . | nindent 10 }} {{- if .Values.cronjobs.taskScheduler.affinity }} affinity: {{- include "common.tplvalues.render" (dict "value" .Values.cronjobs.taskScheduler.affinity "context" $) | nindent 12 }} diff --git a/bitnami/matomo/values.yaml b/bitnami/matomo/values.yaml index 8e1e297635f800..25b24e32e1c4f0 100644 --- a/bitnami/matomo/values.yaml +++ b/bitnami/matomo/values.yaml @@ -963,6 +963,12 @@ cronjobs: ## @param cronjobs.taskScheduler.schedule Kubernetes CronJob schedule ## schedule: "*/5 * * * *" + ## @param cronjobs.taskScheduler.serviceAccountName Attach serviceAccountName to the pod of the CronJob + ## + serviceAccountName: "" + ## @param cronjobs.taskScheduler.automountServiceAccountToken Mount Service Account token in pod of the CronJob + ## + automountServiceAccountToken: true ## @param cronjobs.taskScheduler.suspend Whether to create suspended CronJob ## suspend: false @@ -1062,6 +1068,12 @@ cronjobs: ## @param cronjobs.archive.schedule Kubernetes CronJob schedule ## schedule: "*/5 * * * *" + ## @param cronjobs.archive.serviceAccountName Attach serviceAccountName to the pod of the CronJob + ## + serviceAccountName: "" + ## @param cronjobs.archive.automountServiceAccountToken Mount Service Account token in pod of the CronJob + ## + automountServiceAccountToken: true ## @param cronjobs.archive.suspend Whether to create suspended CronJob ## suspend: false