From aa2ce5fef4dc781e035090aa5627400395d45551 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Mon, 30 Sep 2019 18:38:16 -0500
Subject: [PATCH] Add default netpol to LMA charts

Change-Id: I86389085e922848a833d8787573e0b6be843ace4
Signed-off-by: Tin Lam <tin@irrational.io>
---
 prometheus-alertmanager/values.yaml                        | 7 +++++++
 .../templates/network_policy.yaml                          | 2 +-
 prometheus-kube-state-metrics/values.yaml                  | 7 +++++++
 prometheus-process-exporter/templates/network_policy.yaml  | 2 +-
 prometheus-process-exporter/values.yaml                    | 7 +++++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index 083e7b56c..ea5cf179f 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -189,6 +189,13 @@ manifests:
   service_ingress: true
   statefulset: true
 
+network_policy:
+  alertmanager:
+    ingress:
+      - {}
+    egress:
+      - {}
+
 conf:
   command_flags:
     storage:
diff --git a/prometheus-kube-state-metrics/templates/network_policy.yaml b/prometheus-kube-state-metrics/templates/network_policy.yaml
index f0fc256be..edd570b55 100644
--- a/prometheus-kube-state-metrics/templates/network_policy.yaml
+++ b/prometheus-kube-state-metrics/templates/network_policy.yaml
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License. */}}
 
 {{- if .Values.manifests.network_policy -}}
-{{- $netpol_opts := dict "envAll" . "name" "application" "label" "kube-state-metrics" -}}
+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "kube_state_metrics" -}}
 {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
 {{- end -}}
diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml
index 4cb7c21bc..61d1ebf3f 100644
--- a/prometheus-kube-state-metrics/values.yaml
+++ b/prometheus-kube-state-metrics/values.yaml
@@ -148,6 +148,13 @@ endpoints:
       metrics:
         default: 10252
 
+network_policy:
+  kube_state_metrics:
+    ingress:
+      - {}
+    egress:
+      - {}
+
 monitoring:
   prometheus:
     enabled: true
diff --git a/prometheus-process-exporter/templates/network_policy.yaml b/prometheus-process-exporter/templates/network_policy.yaml
index 99c1a1456..653cd1768 100644
--- a/prometheus-process-exporter/templates/network_policy.yaml
+++ b/prometheus-process-exporter/templates/network_policy.yaml
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License. */}}
 
 {{- if .Values.manifests.network_policy -}}
-{{- $netpol_opts := dict "envAll" . "name" "application" "label" "prometheus-process-exporter" -}}
+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "prometheus_process_exporter" -}}
 {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
 {{- end -}}
diff --git a/prometheus-process-exporter/values.yaml b/prometheus-process-exporter/values.yaml
index e09fa1d19..a1cde2129 100644
--- a/prometheus-process-exporter/values.yaml
+++ b/prometheus-process-exporter/values.yaml
@@ -148,6 +148,13 @@ endpoints:
       metrics:
         default: 9256
 
+network_policy:
+  prometheus_process_exporter:
+    ingress:
+      - {}
+    egress:
+      - {}
+
 manifests:
   configmap_bin: true
   daemonset: true