From aa183819be7b27a276d26533de46330c9f3e5eac Mon Sep 17 00:00:00 2001
From: Tomas Klapka <tomas.klapka@bonitoo.io>
Date: Fri, 23 Jun 2023 11:32:24 +0200
Subject: [PATCH 1/4] fix: influxdb1 ingress resource

---
 charts/influxdb/templates/ingress.yaml | 18 ++++++++----------
 charts/influxdb/values.yaml            |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/charts/influxdb/templates/ingress.yaml b/charts/influxdb/templates/ingress.yaml
index 8c8ebebc..6d4a22b5 100644
--- a/charts/influxdb/templates/ingress.yaml
+++ b/charts/influxdb/templates/ingress.yaml
@@ -4,28 +4,26 @@ kind: Ingress
 metadata:
   name: {{ include "influxdb.fullname" . }}
   labels:
-    {{- include "influxdb.labels" . | nindent 4 }}
-  {{- if .Values.ingress.annotations }}
+{{- include "influxdb.labels" . | nindent 4 }}
+{{- if .Values.ingress.annotations }}
   annotations:
-  {{ toYaml .Values.ingress.annotations | indent 4 }}
-  {{- end }}
+{{ toYaml .Values.ingress.annotations | indent 4 }}
+{{- end }}
 spec:
 {{- if .Values.ingress.tls }}
   tls:
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+{{- if .Values.ingress.secretName }}
       secretName: {{ .Values.ingress.secretName }}
 {{- end }}
+{{- end }}
 {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className }}
 {{- end }}
   rules:
-  {{- if .Values.ingress.hostname }}
-    - host: {{ .Values.ingress.hostname }}
+    - host: {{ .Values.ingress.hostname | quote }}
       http:
-  {{- else }}
-    - http:
-  {{- end }}
         paths:
           - path: {{ .Values.ingress.path }}
             pathType: Prefix
@@ -34,4 +32,4 @@ spec:
                 name: {{ include "influxdb.fullname" . }}
                 port:
                   number: {{ include "influxdb.httpPortNumber" . }}
-  {{- end }}
+{{- end }}
diff --git a/charts/influxdb/values.yaml b/charts/influxdb/values.yaml
index 1bdf1c0b..13c7d4fd 100644
--- a/charts/influxdb/values.yaml
+++ b/charts/influxdb/values.yaml
@@ -140,7 +140,7 @@ ingress:
   enabled: false
   tls: false
   # secretName: my-tls-cert # only needed if tls above is true
-  hostname: ""
+  hostname: "*"
   className: nginx
   annotations: {}
     # nginx.ingress.kubernetes.io/rewrite-target: $1

From ad3ea08fdc6150f8b77af1f9b91d56cb7b765700 Mon Sep 17 00:00:00 2001
From: Tomas Klapka <tomas.klapka@bonitoo.io>
Date: Fri, 23 Jun 2023 11:37:03 +0200
Subject: [PATCH 2/4] fix: bump chart version

---
 charts/influxdb/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/influxdb/Chart.yaml b/charts/influxdb/Chart.yaml
index b7667691..90962f8b 100755
--- a/charts/influxdb/Chart.yaml
+++ b/charts/influxdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: influxdb
-version: 4.12.2
+version: 4.12.3
 appVersion: 1.8.10
 description: Scalable datastore for metrics, events, and real-time analytics.
 keywords:

From acddf6c9ac55523f1c15a06c2b058768827ec786 Mon Sep 17 00:00:00 2001
From: Tomas Klapka <tomas.klapka@bonitoo.io>
Date: Fri, 30 Jun 2023 14:59:25 +0200
Subject: [PATCH 3/4] fix: ingress host value

---
 charts/influxdb/templates/ingress.yaml | 4 ++++
 charts/influxdb/values.yaml            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/influxdb/templates/ingress.yaml b/charts/influxdb/templates/ingress.yaml
index 6d4a22b5..f5a77f89 100644
--- a/charts/influxdb/templates/ingress.yaml
+++ b/charts/influxdb/templates/ingress.yaml
@@ -22,8 +22,12 @@ spec:
   ingressClassName: {{ .Values.ingress.className }}
 {{- end }}
   rules:
+{{- if .Values.ingress.hostname }}
     - host: {{ .Values.ingress.hostname | quote }}
       http:
+{{- else }}
+    - http:
+{{- end }}
         paths:
           - path: {{ .Values.ingress.path }}
             pathType: Prefix
diff --git a/charts/influxdb/values.yaml b/charts/influxdb/values.yaml
index 13c7d4fd..73d35976 100644
--- a/charts/influxdb/values.yaml
+++ b/charts/influxdb/values.yaml
@@ -140,7 +140,7 @@ ingress:
   enabled: false
   tls: false
   # secretName: my-tls-cert # only needed if tls above is true
-  hostname: "*"
+  hostname:
   className: nginx
   annotations: {}
     # nginx.ingress.kubernetes.io/rewrite-target: $1

From 7c45c97d5625bb84f22e529ec3525555fafb32d8 Mon Sep 17 00:00:00 2001
From: Tomas Klapka <tomas.klapka@bonitoo.io>
Date: Fri, 30 Jun 2023 15:17:11 +0200
Subject: [PATCH 4/4] chore: bumb chart version

---
 charts/influxdb/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/influxdb/Chart.yaml b/charts/influxdb/Chart.yaml
index 90962f8b..12e9b66c 100755
--- a/charts/influxdb/Chart.yaml
+++ b/charts/influxdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: influxdb
-version: 4.12.3
+version: 4.12.4
 appVersion: 1.8.10
 description: Scalable datastore for metrics, events, and real-time analytics.
 keywords: