diff --git a/stable/graylog/Chart.yaml b/stable/graylog/Chart.yaml index 5599c3539e..a0d3f94113 100755 --- a/stable/graylog/Chart.yaml +++ b/stable/graylog/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: graylog home: https://www.graylog.org -version: 1.6.9 +version: 1.6.10 appVersion: 3.1 description: Graylog is the centralized log management solution built to open standards for capturing, storing, and enabling real-time analysis of terabytes of machine data. keywords: diff --git a/stable/graylog/README.md b/stable/graylog/README.md index f4d50a4435..6159550931 100644 --- a/stable/graylog/README.md +++ b/stable/graylog/README.md @@ -176,6 +176,7 @@ The following table lists the configurable parameters of the Graylog chart and t | `graylog.journal.deleteBeforeStart` | Delete all journal files before start Graylog | `false` | | `graylog.init.resources` | Configure resource requests and limits for the Graylog StatefulSet initContainer | `{}` | | `graylog.provisioner.enabled` | Enable optional Job to run an arbitrary Bash script | `false` | +| `graylog.provisioner.annotations` | Graylog provisioner Job annotations | `{}` | | `graylog.provisioner.useGraylogServiceAccount` | Use the same ServiceAccount used by Graylog pod | `false` | | `graylog.provisioner.script` | The contents of the provisioner Bash script | | | `graylog.sidecarContainers` | Sidecar containers to run in the server statefulset | `[]` | @@ -322,4 +323,4 @@ Note: All uncommitted logs will be permanently DELETED when this value is true [2]: https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/ingress/annotation/#actions [3]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret [4]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ -[5]: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip \ No newline at end of file +[5]: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip diff --git a/stable/graylog/templates/job.yaml b/stable/graylog/templates/job.yaml index 12f2c19dcd..d58386a6c4 100644 --- a/stable/graylog/templates/job.yaml +++ b/stable/graylog/templates/job.yaml @@ -5,6 +5,10 @@ metadata: name: {{ template "graylog.fullname" . }}-provisioner-job labels: {{ include "graylog.metadataLabels" . | indent 4 }} +{{- with .Values.graylog.provisioner.annotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} spec: template: metadata: diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml index 5c86110cc8..a8db3381db 100644 --- a/stable/graylog/values.yaml +++ b/stable/graylog/values.yaml @@ -368,6 +368,7 @@ graylog: ## provisioner: enabled: false + annotations: {} useGraylogServiceAccount: false # script: | # json='{