Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ingress host default value and template #572

Merged
merged 5 commits into from
Jun 30, 2023
Merged

fix ingress host default value and template #572

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa18381
fix: influxdb1 ingress resource
tomklapka Jun 23, 2023
ad3ea08
fix: bump chart version
tomklapka Jun 23, 2023
acddf6c
fix: ingress host value
tomklapka Jun 30, 2023
7c45c97
chore: bumb chart version
tomklapka Jun 30, 2023
c1c9a0d
Merge branch 'master' into fix/influxdb-ingress
tomklapka Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/influxdb/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: influxdb
version: 4.12.2
version: 4.12.4
appVersion: 1.8.10
description: Scalable datastore for metrics, events, and real-time analytics.
keywords:
Expand Down
20 changes: 11 additions & 9 deletions charts/influxdb/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,30 @@ 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 }}
{{- if .Values.ingress.hostname }}
- host: {{ .Values.ingress.hostname | quote }}
http:
{{- else }}
{{- else }}
- http:
{{- end }}
{{- end }}
paths:
- path: {{ .Values.ingress.path }}
pathType: Prefix
Expand All @@ -34,4 +36,4 @@ spec:
name: {{ include "influxdb.fullname" . }}
port:
number: {{ include "influxdb.httpPortNumber" . }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/influxdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down