From 4475f28c8b3b4962f8db084aeb767d53432fbf77 Mon Sep 17 00:00:00 2001
From: Marius Ensrud <marius.ensrud@buypass.no>
Date: Wed, 28 Oct 2020 12:43:04 +0100
Subject: [PATCH] update ingress labels + defaults for servicetype prometheus

---
 charts/prometheus/v6.3.0/questions.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/charts/prometheus/v6.3.0/questions.yml b/charts/prometheus/v6.3.0/questions.yml
index fcdc6d7..ca6ebed 100644
--- a/charts/prometheus/v6.3.0/questions.yml
+++ b/charts/prometheus/v6.3.0/questions.yml
@@ -112,13 +112,13 @@ questions:
   required: true
   subquestions:
   - variable: server.ingress.hosts[0]
-    default: ""
-    description: "Prometheus server ingress (only hostname (default path /) or hostname/path ex: cluster.local/prometheus)"
-    type: string
+    default: "xip.io"
+    description: "Prometheus server ingress hostname"
+    type: hostname
     required: true
-    label: Hostname & Path
+    label: Hostname
 - variable: server.service.type
-  default: "ClusterIP"
+  default: "NodePort"
   description: "Server service type"
   group: "Prometheus Server"
   type: enum
@@ -167,7 +167,7 @@ questions:
   label: Enable Alertmanager
   show_subquestion_if: true
 - variable: alertmanager.ingress.enabled
-  default: "true"
+  default: "false"
   description: "Expose alertmanager using Layer 7 Load Balancer - ingress"
   type: boolean
   group: "Alertmanager"
@@ -177,11 +177,11 @@ questions:
   required: true
   subquestions:
   - variable: alertmanager.ingress.hosts[0]
-    default: ""
-    description: "Alertmanager server ingress (only hostname & default path /, or hostname/path)"
-    type: string
+    default: "xip.io"
+    description: "Hostname to your alertmanager installation"
+    type: hostname
     required: true
-    label: Hostname & Path
+    label: Hostname
     show_if: "alertmanager.enabled=true"
 - variable: alertmanager.service.type
   default: "ClusterIP"
@@ -192,7 +192,6 @@ questions:
   options:
     - "ClusterIP"
     - "NodePort"
-    - "LoadBalancer"    
   required: true
   label: Alertmanager Service Type
   show_subquestion_if: "NodePort"