From 920bddde6470eedc746f692b4f07070bb4718124 Mon Sep 17 00:00:00 2001 From: "dt241s@att.com" Date: Wed, 26 Feb 2020 03:11:03 +0000 Subject: [PATCH] Enable Apparmor to nagios Change-Id: I5927d32903cabd93b9d78c0c47994a94162deb1c --- nagios/templates/deployment.yaml | 1 + nagios/values_overrides/apparmor.yaml | 8 ++++++++ tools/deployment/apparmor/095-nagios.sh | 1 + zuul.d/jobs.yaml | 1 + 4 files changed, 11 insertions(+) create mode 100644 nagios/values_overrides/apparmor.yaml create mode 120000 tools/deployment/apparmor/095-nagios.sh diff --git a/nagios/templates/deployment.yaml b/nagios/templates/deployment.yaml index bfbf74ee8c..32fbbeca6f 100644 --- a/nagios/templates/deployment.yaml +++ b/nagios/templates/deployment.yaml @@ -81,6 +81,7 @@ spec: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} +{{ dict "envAll" $envAll "podName" "nagios" "containerNames" (list "apache-proxy" "nagios" "init" "define-nagios-hosts") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: {{ dict "envAll" $envAll "application" "monitoring" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} serviceAccountName: {{ $serviceAccountName }} diff --git a/nagios/values_overrides/apparmor.yaml b/nagios/values_overrides/apparmor.yaml new file mode 100644 index 0000000000..0a4f483f8b --- /dev/null +++ b/nagios/values_overrides/apparmor.yaml @@ -0,0 +1,8 @@ +pod: + mandatory_access_control: + type: apparmor + nagios: + nagios: runtime/default + init: runtime/default + define-nagios-hosts: runtime/default + apache-proxy: runtime/default diff --git a/tools/deployment/apparmor/095-nagios.sh b/tools/deployment/apparmor/095-nagios.sh new file mode 120000 index 0000000000..5371752a3b --- /dev/null +++ b/tools/deployment/apparmor/095-nagios.sh @@ -0,0 +1 @@ +../osh-infra-monitoring/120-nagios.sh \ No newline at end of file diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 1d7d948a94..81775b483f 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -285,6 +285,7 @@ - ./tools/deployment/apparmor/080-grafana.sh - ./tools/deployment/apparmor/085-rabbitmq.sh - ./tools/deployment/apparmor/090-elasticsearch.sh + - ./tools/deployment/apparmor/095-nagios.sh - ./tools/deployment/apparmor/100-fluentbit.sh - ./tools/deployment/apparmor/110-fluentd-daemonset.sh - ./tools/deployment/apparmor/120-openvswitch.sh