[pulsar-helm-chart] branch master updated: Ingress optional hostname (#54)

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
     new bf349a8  Ingress optional hostname (#54)
bf349a8 is described below

commit bf349a8c057772bad76dff2048d24700f6f2f112
Author: Thomas O'Neill <to...@gmail.com>
AuthorDate: Mon Sep 21 14:16:20 2020 -0400

    Ingress optional hostname (#54)
    
    Fixes #50
    
    ### Motivation
    The host option is not required to setup an ingress, so I made it an optional value
    ### Modifications
    
    *Describe the modifications you've done.*
    Made setting the host optional.
---
 charts/pulsar/templates/grafana-ingress.yaml        | 11 +++++++----
 charts/pulsar/templates/proxy-ingress.yaml          |  6 ++++--
 charts/pulsar/templates/pulsar-manager-ingress.yaml |  6 ++++--
 charts/pulsar/values.yaml                           |  3 ---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/charts/pulsar/templates/grafana-ingress.yaml b/charts/pulsar/templates/grafana-ingress.yaml
index 17f15b1..91af70a 100644
--- a/charts/pulsar/templates/grafana-ingress.yaml
+++ b/charts/pulsar/templates/grafana-ingress.yaml
@@ -39,12 +39,15 @@ spec:
 {{ toYaml .Values.grafana.ingress.tls | indent 4 }}
 {{- end }}
   rules:
-    - host: {{ required "Grafana ingress hostname not provided" .Values.grafana.ingress.hostname }}
-      http:
+    - http:
         paths:
         - path: {{ .Values.grafana.ingress.path }}
           backend:
             serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
             servicePort: {{ .Values.grafana.ingress.port }}
-{{- end }}
-{{- end }}
+      {{- if .Values.grafana.ingress.hostname }}
+      host: {{ .Values.grafana.ingress.hostname }}
+      {{- end }}
+      
+  {{- end }}
+  {{- end }}
diff --git a/charts/pulsar/templates/proxy-ingress.yaml b/charts/pulsar/templates/proxy-ingress.yaml
index 522aec3..c9339ba 100644
--- a/charts/pulsar/templates/proxy-ingress.yaml
+++ b/charts/pulsar/templates/proxy-ingress.yaml
@@ -40,8 +40,7 @@ spec:
       {{- end }}
 {{- end }}
   rules:
-    - host: {{ required "proxy ingress hostname not provided" .Values.proxy.ingress.hostname }}
-      http:
+    - http:
         paths:
           - path: {{ .Values.proxy.ingress.path }}
             backend:
@@ -51,4 +50,7 @@ spec:
               {{- else }}
               servicePort: {{ .Values.proxy.ports.http }}
               {{- end }}
+      {{- if .Values.proxy.ingress.hostname }}
+      host: {{ .Values.proxy.ingress.hostname }}
+      {{- end }}
 {{- end }}
diff --git a/charts/pulsar/templates/pulsar-manager-ingress.yaml b/charts/pulsar/templates/pulsar-manager-ingress.yaml
index 9678cb1..5a72203 100644
--- a/charts/pulsar/templates/pulsar-manager-ingress.yaml
+++ b/charts/pulsar/templates/pulsar-manager-ingress.yaml
@@ -40,11 +40,13 @@ spec:
       {{- end }}
 {{- end }}
   rules:
-    - host: {{ required "pulsar_manager ingress hostname not provided" .Values.pulsar_manager.ingress.hostname }}
-      http:
+    - http:
         paths:
           - path: {{ .Values.pulsar_manager.ingress.path }}
             backend:
               serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}"
               servicePort: {{ .Values.pulsar_manager.service.targetPort }}
+      {{- if .Values.pulsar_manager.ingress.hostname }}
+      host: {{ .Values.pulsar_manager.ingress.hostname }}
+      {{- end }}
 {{- end }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index a2a73e7..6ec3dc1 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -739,7 +739,6 @@ proxy:
       ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
       secretName: ""
 
-    ## Required if ingress is enabled
     hostname: ""
     path: "/"
   ## Proxy PodDisruptionBudget
@@ -909,7 +908,6 @@ grafana:
 
     ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
     extraPaths: []
-    ## Required if ingress is enabled
     hostname: ""
     protocol: http
     path: /grafana
@@ -962,7 +960,6 @@ pulsar_manager:
       ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
       secretName: ""
 
-    ## Required if ingress is enabled
     hostname: ""
     path: "/"