From 736af38c9c6cba6a80a33aa2e23ed21ee9e958fe Mon Sep 17 00:00:00 2001
From: Meg Heisler <mh783g@att.com>
Date: Fri, 22 Feb 2019 11:15:57 -0600
Subject: [PATCH] Add ingress network policy for Nagios

This adds the ingress network policy to Nagios
using the helm-toolkit template

Change-Id: If6cc66330b24c3f79f9b5c29a94ea904d1eb37d4
---
 nagios/values.yaml                                   |  5 +++++
 tools/deployment/network-policy/110-nagios.sh        | 12 ++++++++----
 .../network-policy/901-test-networkpolicy.sh         |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nagios/values.yaml b/nagios/values.yaml
index cd9401e02..d82b9f389 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -185,6 +185,11 @@ network:
       enabled: false
       port: 30925
 
+network_policy:
+  nagios:
+    ingress:
+      - {}
+
 pod:
   lifecycle:
     upgrades:
diff --git a/tools/deployment/network-policy/110-nagios.sh b/tools/deployment/network-policy/110-nagios.sh
index 61623be16..290758532 100755
--- a/tools/deployment/network-policy/110-nagios.sh
+++ b/tools/deployment/network-policy/110-nagios.sh
@@ -19,7 +19,7 @@ set -xe
 #NOTE: Lint and package chart
 make nagios
 
-tee /tmp/nagios.yaml <<EOF
+tee /tmp/nagios.yaml << EOF
 manifests:
   network_policy: true
 network_policy:
@@ -29,14 +29,18 @@ network_policy:
         - podSelector:
             matchLabels:
               application: nagios
+        - podSelector:
+            matchLabels:
+              application: ingress
         ports:
-        - protocol: TCP
-          port: 8000
         - protocol: TCP
           port: 80
+        - protocol: TCP
+          port: 8000
+        - protocol:
+          port: 443
 EOF
 
-
 #NOTE: Deploy command
 helm upgrade --install nagios ./nagios \
     --namespace=osh-infra \
diff --git a/tools/deployment/network-policy/901-test-networkpolicy.sh b/tools/deployment/network-policy/901-test-networkpolicy.sh
index fcfa15b80..a8301e386 100755
--- a/tools/deployment/network-policy/901-test-networkpolicy.sh
+++ b/tools/deployment/network-policy/901-test-networkpolicy.sh
@@ -52,6 +52,7 @@ function test_netpol {
 test_netpol osh-infra mariadb server elasticsearch.osh-infra.svc.cluster.local fail
 test_netpol osh-infra mariadb server nagios.osh-infra.svc.cluster.local fail
 test_netpol osh-infra mariadb server prometheus.osh-infra.svc.cluster.local fail
+test_netpol osh-infra mariadb server nagios.osh-infra.svc.cluster.local fail
 
 # Doing positive tests
 test_netpol osh-infra grafana dashboard mariadb.osh-infra.svc.cluster.local:3306 success