From d910337cb70f776f2bfdd5d1a3f1d4848b2df4ea Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Fri, 3 Dec 2021 18:36:54 +0000
Subject: [PATCH] Merge branch 'promtail_selinux_exception' into 'master'
Promtail needs selinux option type spc_t
See merge request platform-one/big-bang/bigbang!1137
(cherry picked from commit 9e80a2187b1bfcde373dffd4b35d3a3bbe6b5df3)
e35726c8 Promtail needs selinux option type spc_t
2d09ed36 add promtail to the wrapped conditional
f983d164 promtail package version bump
7a3d6651 Merge branch 'master' into promtail_selinux_exception
---
chart/templates/gatekeeper/values.yaml | 6 +++++-
chart/values.yaml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/chart/templates/gatekeeper/values.yaml b/chart/templates/gatekeeper/values.yaml
index 197f5d9f9b..808181653d 100644
--- a/chart/templates/gatekeeper/values.yaml
+++ b/chart/templates/gatekeeper/values.yaml
@@ -101,7 +101,7 @@ violations: # Try to keep this in alpha order to make it easier to find keys
{{- end }}
{{- end }}
- {{- if or .Values.fluentbit.enabled .Values.twistlock.enabled }}
+ {{- if or .Values.fluentbit.enabled .Values.twistlock.enabled .Values.promtail.enabled }}
selinuxPolicy:
parameters:
excludedResources:
@@ -113,6 +113,10 @@ violations: # Try to keep this in alpha order to make it easier to find keys
# Twistlock Defenders need selinux option type spc_t
- twistlock/twistlock-defender
{{- end }}
+ {{- if .Values.promtail.enabled }}
+ # Promtail needs selinux option type spc_t
+ - logging/promtail
+ {{- end }}
{{- end }}
{{- if or .Values.fluentbit.enabled .Values.twistlock.enabled .Values.monitoring.enabled .Values.promtail.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 534e53ec4d..52412b334d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -428,7 +428,7 @@ promtail:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/promtail.git
path: "./chart"
- tag: "3.8.1-bb.1"
+ tag: "3.8.1-bb.2"
# -- Flux reconciliation overrides specifically for the Promtail Package
flux: {}
--
GitLab