openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Update TLS secret templates, remove nagios readiness probe"

Browse Source
This commit is contained in:
Zuul 2018-06-28 02:42:40 +00:00 committed by Gerrit Code Review
commit 9071a03417
6 changed files with 5 additions and 10 deletions
grafana/templates
secret-ingress-tls.yaml
kibana/templates
secret-ingress-tls.yaml
nagios/templates
deployment.yamlsecret-ingress-tls.yaml
prometheus-alertmanager/templates
secret-ingress-tls.yaml
prometheus/templates
secret-ingress-tls.yaml

2
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 }}

2
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 }}

5
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" }}

2
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 }}

2
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 }}

2
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 }}