diff --git a/charts/gitlab-omnibus/Chart.yaml b/charts/gitlab-omnibus/Chart.yaml index a594a2b..85830cf 100644 --- a/charts/gitlab-omnibus/Chart.yaml +++ b/charts/gitlab-omnibus/Chart.yaml @@ -3,7 +3,7 @@ name: gitlab-omnibus description: |- Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/). type: application -version: 0.1.2 +version: 0.1.3 # https://hub.docker.com/r/gitlab/gitlab-ee/tags appVersion: "15.2.1-ee.0" home: https://github.com/slamdev/helm-charts/tree/master/charts/gitlab-omnibus diff --git a/charts/gitlab-omnibus/README.md b/charts/gitlab-omnibus/README.md index 44138a6..95cbc6f 100644 --- a/charts/gitlab-omnibus/README.md +++ b/charts/gitlab-omnibus/README.md @@ -1,6 +1,6 @@ # gitlab-omnibus -![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 15.2.1-ee.0](https://img.shields.io/badge/AppVersion-15.2.1--ee.0-informational?style=flat-square) +![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 15.2.1-ee.0](https://img.shields.io/badge/AppVersion-15.2.1--ee.0-informational?style=flat-square) Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/). @@ -21,6 +21,7 @@ Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/). | backupCronJob.command | list | `["gitlab-backup","create","SKIP=uploads,builds,artifacts,terraform_state,registry,pages,packages","GZIP_RSYNCABLE=yes","STRATEGY=copy"]` | command to execute in gitlab container | | backupCronJob.enabled | bool | `true` | enable scheduled backups | | backupCronJob.image | string | `"daedalusproject/base_kubectl"` | image | +| backupCronJob.podAnnotations | object | `{}` | pod annotations | | backupCronJob.resources | object | `{"requests":{"cpu":"10m","memory":"32Mi"}}` | custom resource configuration | | backupCronJob.schedule | string | `"@daily"` | how often to run backaup job | | containerPorts | list | `[{"containerPort":8005,"name":"http"},{"containerPort":22,"name":"ssh"}]` | ports exposed by the container | diff --git a/charts/gitlab-omnibus/templates/cronjob-backup.yaml b/charts/gitlab-omnibus/templates/cronjob-backup.yaml index 2c36b06..c38c0de 100644 --- a/charts/gitlab-omnibus/templates/cronjob-backup.yaml +++ b/charts/gitlab-omnibus/templates/cronjob-backup.yaml @@ -21,6 +21,8 @@ spec: labels: {{- include "gitlab.selectorLabels" . | nindent 12 }} component: 'backup' + annotations: + {{- toYaml .Values.backupCronJob.podAnnotations | nindent 12 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/charts/gitlab-omnibus/values.yaml b/charts/gitlab-omnibus/values.yaml index e8b0c27..1da2291 100644 --- a/charts/gitlab-omnibus/values.yaml +++ b/charts/gitlab-omnibus/values.yaml @@ -243,6 +243,8 @@ gitlabConf: |- backupCronJob: # backupCronJob.enabled -- enable scheduled backups enabled: true + # backupCronJob.podAnnotations -- pod annotations + podAnnotations: { } # backupCronJob.schedule -- how often to run backaup job schedule: "@daily" # backupCronJob.image -- image