From 22ac30d879a8aa9b260e3e152cabf8c214d6e17d Mon Sep 17 00:00:00 2001
From: Steven Fitzpatrick <steven.fitzpatrick@att.com>
Date: Tue, 22 Sep 2020 14:24:02 -0500
Subject: [PATCH] Alerta: Fix values reference in ingress manifests

This change corrects the path in these Values references.

Change-Id: Ibbbd528fd0ecfb98b98ac0e0b95d108c4f320817
---
 alerta/Chart.yaml                        | 2 +-
 alerta/templates/secret-ingress-tls.yaml | 2 +-
 alerta/templates/service-ingress.yaml    | 2 +-
 alerta/values.yaml                       | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/alerta/Chart.yaml b/alerta/Chart.yaml
index 1b3d684a85..346b06b9ff 100644
--- a/alerta/Chart.yaml
+++ b/alerta/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.0.2
 description: OpenStack-Helm Alerta for Alertmanager.
 name: alerta
-version: 0.1.0
+version: 0.1.1
 home: https://github.com/alerta/alerta
 sources:
   - https://github.com/alerta/alerta
diff --git a/alerta/templates/secret-ingress-tls.yaml b/alerta/templates/secret-ingress-tls.yaml
index 7655f3ff31..dbadc748f6 100644
--- a/alerta/templates/secret-ingress-tls.yaml
+++ b/alerta/templates/secret-ingress-tls.yaml
@@ -12,6 +12,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.secret_ingress_tls }}
+{{- if .Values.manifests.alerta.secret_ingress_tls }}
 {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerta" "backendService" "alerta" ) }}
 {{- end }}
diff --git a/alerta/templates/service-ingress.yaml b/alerta/templates/service-ingress.yaml
index c8ba82d1b4..0e0571a131 100644
--- a/alerta/templates/service-ingress.yaml
+++ b/alerta/templates/service-ingress.yaml
@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.service_ingress .Values.network.alerta.ingress.public }}
+{{- if and .Values.manifests.alerta.service_ingress .Values.network.alerta.ingress.public }}
 {{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "alerta" -}}
 {{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/alerta/values.yaml b/alerta/values.yaml
index ead0410f4a..b860891399 100644
--- a/alerta/values.yaml
+++ b/alerta/values.yaml
@@ -124,6 +124,7 @@ endpoints:
     namespace: null
     hosts:
       default: alerta
+      public: alerta-public
     host_fqdn_override:
       default: null
     path: