diff --git a/charts/enterprise-logs/Chart.yaml b/charts/enterprise-logs/Chart.yaml index 0d5e0ec6ec..dc4beaba1c 100644 --- a/charts/enterprise-logs/Chart.yaml +++ b/charts/enterprise-logs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: "v2" name: "enterprise-logs" type: application -version: "2.5.0" +version: "2.5.1" appVersion: "v1.5.2" kubeVersion: "^1.10.0-0" description: "Grafana Enterprise Logs" diff --git a/charts/enterprise-logs/small.yaml b/charts/enterprise-logs/small.yaml index 2978e5dbe9..a13fe94cdb 100644 --- a/charts/enterprise-logs/small.yaml +++ b/charts/enterprise-logs/small.yaml @@ -35,6 +35,17 @@ compactor: cpu: 2 memory: 1Gi +# -target=tokengen +# defined in enterprise-logs chart +tokengen: + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 0.5 + memory: 500Mi + # -target=gateway # defined in enterprise-logs chart gateway: diff --git a/charts/enterprise-logs/templates/tokengen/job-tokengen.yaml b/charts/enterprise-logs/templates/tokengen/job-tokengen.yaml index bac4630b2b..33a7096734 100644 --- a/charts/enterprise-logs/templates/tokengen/job-tokengen.yaml +++ b/charts/enterprise-logs/templates/tokengen/job-tokengen.yaml @@ -73,6 +73,8 @@ spec: mountPath: /etc/loki/config - name: license mountPath: /etc/enterprise-logs/license + resources: + {{- toYaml .Values.enterprise.tokengen.resources | nindent 8 }} env: {{- if .Values.tokengen.env }} {{ toYaml .Values.tokengen.env | nindent 12 }} @@ -97,6 +99,8 @@ spec: mountPath: /etc/loki/config - name: license mountPath: /etc/enterprise-logs/license + resources: + {{- toYaml .Values.enterprise.tokengen.resources | nindent 8 }} securityContext: {{- toYaml .Values.tokengen.containerSecurityContext | nindent 12 }} restartPolicy: OnFailure diff --git a/charts/enterprise-logs/values.yaml b/charts/enterprise-logs/values.yaml index 54607c9e16..a52ed5bde0 100644 --- a/charts/enterprise-logs/values.yaml +++ b/charts/enterprise-logs/values.yaml @@ -189,6 +189,11 @@ tokengen: extraVolumes: [] # -- Additional volume mounts for Pods extraVolumeMounts: [] + + # -- Request and limit Kubernetes resources + # -- Values are defined in small.yaml and large.yaml + resources: {} + # -- Run containers as user `enterprise-logs(uid=10001)` podSecurityContext: runAsNonRoot: true