Skip to content

Commit

Permalink
[Promtail] enables configuring psp in helm chart (grafana#2659)
Browse files Browse the repository at this point in the history
* makes pod security policy configurable

* bump promtail chart version

* bump loki-stack chart version

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
  • Loading branch information
RS Krishna authored and cyriltovena committed Oct 21, 2020
1 parent e5b63c1 commit 129c1ea
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion production/helm/loki-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki-stack
version: 0.40.1
version: 0.41.0
appVersion: v1.6.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 1 addition & 1 deletion production/helm/promtail/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: promtail
version: 0.24.0
version: 0.25.0
appVersion: v1.6.0
kubeVersion: "^1.10.0-0"
description: "Responsible for gathering logs and sending them to Loki"
Expand Down
26 changes: 2 additions & 24 deletions production/helm/promtail/templates/podsecuritypolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,5 @@ metadata:
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
privileged: false
allowPrivilegeEscalation: false
volumes:
- 'secret'
- 'configMap'
- 'hostPath'
- 'projected'
- 'downwardAPI'
- 'emptyDir'
hostNetwork: false
hostIPC: false
hostPID: false
runAsUser:
rule: 'RunAsAny'
seLinux:
rule: 'RunAsAny'
supplementalGroups:
rule: 'RunAsAny'
fsGroup:
rule: 'RunAsAny'
readOnlyRootFilesystem: true
requiredDropCapabilities:
- ALL
{{- end }}
{{- toYaml .Values.podSecurityPolicy | nindent 2 }}
{{- end }}
25 changes: 25 additions & 0 deletions production/helm/promtail/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,31 @@ rbac:
create: true
pspEnabled: true

podSecurityPolicy:
privileged: false
allowPrivilegeEscalation: false
volumes:
- 'secret'
- 'configMap'
- 'hostPath'
- 'projected'
- 'downwardAPI'
- 'emptyDir'
hostNetwork: false
hostIPC: false
hostPID: false
runAsUser:
rule: 'RunAsAny'
seLinux:
rule: 'RunAsAny'
supplementalGroups:
rule: 'RunAsAny'
fsGroup:
rule: 'RunAsAny'
readOnlyRootFilesystem: true
requiredDropCapabilities:
- ALL

readinessProbe:
failureThreshold: 5
httpGet:
Expand Down

0 comments on commit 129c1ea

Please sign in to comment.