From c26a1b53f64ceab8da73ef191270216c569ef74c Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 27 Jun 2018 18:56:45 -0500
Subject: [PATCH] Update TLS secret templates, remove nagios readiness probe

This updates the TLS secret templates to include the backend
service in the dict supplied to the manifest template, as it is
required for the TLS secret to render correctly.

This also removes the readiness probe from the nagios container in
the deployment for the nagios chart, as it wasn't functioning as
intended due to the port not being available for the probe

Change-Id: Iabcfd40c74938e0497d08ffeeebc98ab722fa660
---
 grafana/templates/secret-ingress-tls.yaml                 | 2 +-
 kibana/templates/secret-ingress-tls.yaml                  | 2 +-
 nagios/templates/deployment.yaml                          | 5 -----
 nagios/templates/secret-ingress-tls.yaml                  | 2 +-
 prometheus-alertmanager/templates/secret-ingress-tls.yaml | 2 +-
 prometheus/templates/secret-ingress-tls.yaml              | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/grafana/templates/secret-ingress-tls.yaml b/grafana/templates/secret-ingress-tls.yaml
index 09495bc395..039177deda 100644
--- a/grafana/templates/secret-ingress-tls.yaml
+++ b/grafana/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "grafana" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "grafana" "backendService" "grafana" ) }}
 {{- end }}
diff --git a/kibana/templates/secret-ingress-tls.yaml b/kibana/templates/secret-ingress-tls.yaml
index 2281fdff3f..c874ea53f5 100644
--- a/kibana/templates/secret-ingress-tls.yaml
+++ b/kibana/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "kibana" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "kibana" "backendService" "kibana" ) }}
 {{- end }}
diff --git a/nagios/templates/deployment.yaml b/nagios/templates/deployment.yaml
index e62c257cee..0e057b507e 100644
--- a/nagios/templates/deployment.yaml
+++ b/nagios/templates/deployment.yaml
@@ -143,11 +143,6 @@ spec:
           ports:
             - name: nagios
               containerPort: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          readinessProbe:
-            tcpSocket:
-              port: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-            initialDelaySeconds: 20
-            periodSeconds: 10
           env:
             - name: PROMETHEUS_SERVICE
               value: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
diff --git a/nagios/templates/secret-ingress-tls.yaml b/nagios/templates/secret-ingress-tls.yaml
index 9524cfcb18..dacb1e9b5b 100644
--- a/nagios/templates/secret-ingress-tls.yaml
+++ b/nagios/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "nagios" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "nagios" "backendService" "nagios" ) }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/secret-ingress-tls.yaml b/prometheus-alertmanager/templates/secret-ingress-tls.yaml
index 1409b0cb1d..0e57c12b85 100644
--- a/prometheus-alertmanager/templates/secret-ingress-tls.yaml
+++ b/prometheus-alertmanager/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerts" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerts" "backendService" "alertmanager") }}
 {{- end }}
diff --git a/prometheus/templates/secret-ingress-tls.yaml b/prometheus/templates/secret-ingress-tls.yaml
index 44501abc08..c93e8262d6 100644
--- a/prometheus/templates/secret-ingress-tls.yaml
+++ b/prometheus/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "monitoring" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "monitoring" "backendService" "prometheus" ) }}
 {{- end }}