From 4cffe8fdbbbc14fe35c50d42012cfd46ddf5637a Mon Sep 17 00:00:00 2001 From: Thomas Lovett Date: Mon, 12 Aug 2019 11:17:12 -0500 Subject: [PATCH] [stable/graylog] enable configuration of initContainer resources (#16255) * feat(stable/graylog): enable configuration of initContainer resources This change will make Graylog deployments compatible with clusters using ResourceQuotas to achieve hard or soft multi-tenancy. Using ResourceQuotas in this way requires that every container has explicit CPU and/or Memory resources configured Signed-off-by: Thomas Lovett * docs(stable/graylog): add missing backtick to fix formatting Signed-off-by: Thomas Lovett * chore(stable/graylog): bump version from 1.2.0 to 1.3.0 Signed-off-by: Thomas Lovett --- stable/graylog/Chart.yaml | 2 +- stable/graylog/README.md | 3 ++- stable/graylog/templates/statefulset.yaml | 4 ++++ stable/graylog/values.yaml | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/stable/graylog/Chart.yaml b/stable/graylog/Chart.yaml index 9aa1ec1b52..429e5ab264 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.2.0 +version: 1.3.0 appVersion: 3.0.2-2 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 377d076745..586b05bdeb 100644 --- a/stable/graylog/README.md +++ b/stable/graylog/README.md @@ -138,8 +138,9 @@ The following table lists the configurable parameters of the Cassandra chart and | `graylog.config` | Add additional server configuration to `graylog.conf` file. | `` | | `graylog.serverFiles` | Add additional server files on /etc/graylog/server. This is useful for enable TLS on input | `{}` | | `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.script | The contents of the provisioner Bash script | `` | +| `graylog.provisioner.script` | The contents of the provisioner Bash script | `` | | `rbac.create` | If true, create & use RBAC resources | `true` | | `rbac.serviceAccount.create` | If true, create the Graylog service account | `true` | | `rbac.serviceAccount.name` | Name of the server service account to use or create | `{{ graylog.fullname }}` | diff --git a/stable/graylog/templates/statefulset.yaml b/stable/graylog/templates/statefulset.yaml index 208f771e21..603d966adf 100644 --- a/stable/graylog/templates/statefulset.yaml +++ b/stable/graylog/templates/statefulset.yaml @@ -78,6 +78,10 @@ spec: mountPath: /usr/share/graylog/data/journal - mountPath: /k8s name: kubectl +{{- if .Values.graylog.init.resources }} + resources: +{{ toYaml .Values.graylog.init.resources | indent 12 }} +{{- end }} containers: - name: graylog-server image: "{{ .Values.graylog.image.repository }}" diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml index c6229cfff8..19d8873f4e 100644 --- a/stable/graylog/values.yaml +++ b/stable/graylog/values.yaml @@ -257,6 +257,10 @@ graylog: ## deleteBeforeStart: false + init: + # Configure resource requests and limits for the Graylog StatefulSet initContainer + resources: {} + ## Additional server files will be deployed to /etc/graylog/server ## For example, you can put server certificates or authorized clients certificates here ##