From 7aa9d4ddab081e5bd677a02755f390004685d2de Mon Sep 17 00:00:00 2001
From: "KHIYANI, RAHUL (rk0850)" <rk0850@att.com>
Date: Wed, 19 Feb 2020 22:17:53 -0600
Subject: [PATCH] fix memcached-exporter chart for adding default apparmor
 profile

Change-Id: Ia434e9f45401661137a92f25ed5067a0e941c70b
---
 .../templates/monitoring/prometheus/exporter-deployment.yaml  | 1 -
 memcached/values_overrides/apparmor.yaml                      | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/memcached/templates/monitoring/prometheus/exporter-deployment.yaml b/memcached/templates/monitoring/prometheus/exporter-deployment.yaml
index 11eec254c..1e8622a7e 100644
--- a/memcached/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/memcached/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -41,7 +41,6 @@ spec:
       namespace: {{ .Values.endpoints.prometheus_memcached_exporter.namespace }}
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
-        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "prometheus_memcached_exporter" "containerNames" (list "memcached-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "memcached_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
diff --git a/memcached/values_overrides/apparmor.yaml b/memcached/values_overrides/apparmor.yaml
index 85a9fe86b..1ac05b2a7 100644
--- a/memcached/values_overrides/apparmor.yaml
+++ b/memcached/values_overrides/apparmor.yaml
@@ -5,3 +5,7 @@ pod:
       memcached-exporter: runtime/default
     memcached:
       memcached: runtime/default
+
+monitoring:
+  prometheus:
+    enabled: false