Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

7.x bump #1199

Closed
wants to merge 152 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
fb3b0a7
[release] Initiate 7.7 branch (#541)
mgreau Apr 9, 2020
29d33c3
[meta] fix ci jobs
jmlrt Apr 10, 2020
0f87b17
Merge pull request #570 from jmlrt/fix-ci-jobs-77-branch
jmlrt Apr 10, 2020
a55cea1
[jenkins] Fix Google cluster name (#571)
mgreau Apr 10, 2020
b9e724e
[ci] Fix triggering upstream cleanup job (#578)
mgreau Apr 14, 2020
32ed278
Merge pull request #567 from jmlrt/metricbeat-improvements
jmlrt Apr 10, 2020
724f306
Merge pull request #568 from jmlrt/filebeat-improvements
jmlrt Apr 10, 2020
7ccb9e5
[doc] Update links to 7.7 branch (#579)
mgreau Apr 14, 2020
26bd1ca
Merge pull request #580 from jmlrt/helm-2-16-6
jmlrt Apr 15, 2020
68a54af
[script] Update bumper script to handle SNAPSHOT versions (#581)
mgreau Apr 15, 2020
42eef5d
[ci] Fix multijob configuration for testing staging artifacts (#582)
mgreau Apr 15, 2020
1785431
Merge pull request #583 from Conky5/use-different-image-for-random-key
Conky5 Apr 15, 2020
f74d721
Merge pull request #572 from jmlrt/split-metricbeat-values
jmlrt Apr 17, 2020
f59b2c8
Merge pull request #585 from jmlrt/metricbeat-hostnetwork
jmlrt Apr 17, 2020
fd72d67
Merge pull request #590 from marcostvz/patch-1
jmlrt Apr 20, 2020
65eebf9
Merge pull request #584 from michelesr/master
jmlrt Apr 20, 2020
bcaaaad
Merge pull request #522 from domgoodwin/helm-default-patch
jmlrt Apr 21, 2020
ac520df
Merge pull request #586 from jmlrt/readiness-to-503
jmlrt Apr 21, 2020
e2d4b9c
Merge pull request #569 from cartonalexandre/master
jmlrt Apr 23, 2020
ab26d11
Merge pull request #591 from jmlrt/logstash-http-host-var
jmlrt Apr 27, 2020
6a66c2e
Merge pull request #593 from jmlrt/doc-improvements (#599)
jmlrt Apr 28, 2020
f3f4e27
FAQ and examples improvements (#598) (#600)
jmlrt Apr 28, 2020
1c63c35
[meta] bump version on examples readme (#601)
jmlrt Apr 29, 2020
847b525
initiate 7.x branch (#605)
jmlrt May 5, 2020
ff38c8d
[helm] bump helm version to 2.16.7 (#607)
jmlrt May 6, 2020
675f62e
[metricbeat] fix deployment upgrade by removing chart label from .spe…
jmlrt May 18, 2020
8c904bb
Fix configchecksum not being set (#634)
MaxRink May 27, 2020
df0e7d8
Fix values links in examples/multi/README.md (#639)
coolbaluk May 27, 2020
ba03954
[kibana] String/YAML conditions for `.Values.{extraContainers,extraIn…
maxkochubey May 27, 2020
207674e
[elasticsearch] Fix issue with `readinessProbe` causing outages (#638)
May 28, 2020
934e652
[metricbeat] use deprecated kube-state-metrics config when existing (…
jmlrt May 28, 2020
a32bcae
Elasticsearch secret mountmode (#596)
domgoodwin May 28, 2020
d5f327b
[kibana] Add extensible label support (#555)
ramrodo May 29, 2020
c96be3d
[meta] add support for k8s 1.16 (#635)
jmlrt May 29, 2020
344bc38
[helm] bump helm version to 2.16.8 (#657)
jmlrt Jun 11, 2020
285914a
Elasticsearch: do not include heritage selector (#437)
desaintmartin Jun 11, 2020
487e73b
bump 7.x branch to 7.9.0-SNAPSHOT (#661)
jmlrt Jun 12, 2020
6ad3a5f
[apm-server] increase memory limit (#664)
jmlrt Jun 15, 2020
ba17055
[elasticsearch] Disable service links to prevent very long startup ti…
Jun 17, 2020
8409ed1
[apm-server] allow customizing probes (#671)
jmlrt Jun 18, 2020
d31b4a0
[elasticsearch] update kind example for version >= 0.7.0 (#669)
jmlrt Jun 18, 2020
4f2e8f5
[helm] bump helm version to 2.16.9 (#667)
jmlrt Jun 18, 2020
6d819a7
[logstash] add security example (#392)
jmlrt Jun 18, 2020
e10a7d1
podSecurityContext.runAsUser needs to be nulled as well for Openshift…
mephinet Jun 23, 2020
c72f37c
[meta] disable stackdriver for gke test clusters (#687)
jmlrt Jun 24, 2020
be7e3c4
Add ServiceAccount annotations (#686)
jim-barber-he Jun 26, 2020
e93a51d
[logstash] fix version in security test (#697)
jmlrt Jun 29, 2020
c0b75d5
Elasticsearch: set PVC labels through setting all StatefulSet labels …
desaintmartin Jun 29, 2020
0c1a5f3
[docs] Improve visibility of 6.8 and 7.x releases (#690)
Jun 29, 2020
6735988
[doc] fix copy-paste errors
jmlrt Jun 29, 2020
c450421
[logstash] add headless service for statefulset (#695)
jmlrt Jun 29, 2020
1223398
[filebeat] add permission to list nodes (#704)
bmilescu Jul 2, 2020
feec797
[testing] Ensure that the 'namespace' is specified in Helm command (#…
Jul 8, 2020
a5fec3e
feat(metricbeat): annotation support for daemonset and deployment (#713)
kernkonzentrat Jul 8, 2020
6051c30
[apm-server] Add to test matrix (#708)
Jul 8, 2020
665e1b2
Support creating k8s helm secrets for logstash helm chart #705 (#712)
kksudo Jul 8, 2020
b09bbdc
[filebeat] document probe workaround for kafka output (#699)
jmlrt Jul 8, 2020
6ec92bd
Metricbeat daemonset deployment optional (#716)
erihanse Jul 9, 2020
f8add3d
Make kube-state-metrics optional for installation (#387)
SergK Jul 13, 2020
8430060
[elasticsearch] _helpers.tpl - elasticsearch.endpoints to use elastic…
xario Jul 13, 2020
5f5c0d3
[logstash] Restart the logstash pod when the secrets have changed (#723)
kksudo Jul 15, 2020
fc1bc13
[elasticsearch] Update test image pull policy. (#727)
fhaase2 Jul 15, 2020
ff8ca5f
[Kibana] Add loadbalancerIP to service spec in kibana (#726)
debojitkakoti Jul 16, 2020
a55efee
[doc] fix some links (#737)
jmlrt Jul 17, 2020
8376578
Update README.md (#749)
AhmedSamirAhmed Jul 27, 2020
aa7e446
[release] bump 7.x branch to 7.10.0-SNAPSHOT (#757)
jmlrt Jul 28, 2020
8555428
[meta] add slack notifications to CI jobs (#760)
jmlrt Jul 28, 2020
8acfe40
[doc] update doc links (#758)
jmlrt Jul 28, 2020
e59d4f2
[meta] add helm 3 beta support (#759)
jmlrt Jul 29, 2020
4ef323e
[meta] remove branch specific staging jobs (#736)
jmlrt Jul 29, 2020
af48a18
[meta] drop gke 1.14 tests (#798)
jmlrt Aug 26, 2020
5fa5c34
[helm] bump helm version to 2.16.10 (#797)
jmlrt Aug 27, 2020
2cfd4ee
Fix typo in FAQ (#744)
SlavaSubotskiy Aug 27, 2020
b2334b5
Missing deletion of "elastic-certificate-crt" (#752)
AhmedSamirAhmed Aug 27, 2020
2bd98f7
Remove duplicate "initialDelaySeconds" field (#763)
ebuildy Aug 27, 2020
991cb1c
[logstash] Fix headless service ports spec (#776)
itssimon Aug 27, 2020
0b14236
[metricbeat] Add missing labels for deployment (#770)
vliubko Aug 27, 2020
a3d081f
Fix serviceAccount for APM server (#786)
caiconkhicon Aug 27, 2020
59b9786
[metricbeat] Support secrets (#778)
erihanse Sep 10, 2020
65bf107
[elasticsearch] add loadBalancer externalTrafficPolicy option (#810)
luanguimaraesla Sep 16, 2020
091de92
Include pre-releases in the semver range. (#729)
Sep 16, 2020
e6e4e1a
[elasticsearch] fix secrets names in examples (#811)
jmlrt Sep 16, 2020
8e39cde
[helm] bump helm version to 2.16.12 (#816)
jmlrt Sep 23, 2020
2e46001
[elasticsearch][kibana] disable nss dentry cache (#818)
jmlrt Sep 30, 2020
45c054e
support tpl in logstashConfig, logstashPipeline and kibanaConfig (#717)
qqshfox Oct 2, 2020
b38a4fc
[metricbeat] support deployment/daemonset specific metrics (#820)
v1r7u Oct 2, 2020
288171f
[filebeat] introduce dnsConfig values for the containers (#659)
orong-pp Oct 5, 2020
30373da
[logstash] use only httpPort in headless service (#839)
jmlrt Oct 14, 2020
22b0c8b
Added ingress support to the logstash chart (#793)
jnbelo Oct 16, 2020
5918d20
fixup! Added ingress support to the logstash chart (#793)
jmlrt Oct 16, 2020
d8f2b4b
[Metricbeat] Dont generate config if not enabled (#767)
ebuildy Oct 20, 2020
5d351fb
[all] Simplify doc in 7.x branch (#860)
nkammah Oct 21, 2020
65e19b5
[elasticsearch] add coordinator node to multi test (#854)
jmlrt Oct 27, 2020
27dde9f
[meta] add support for helm 2.17.0 and k8s 1.17 (#880)
jmlrt Nov 3, 2020
b25cc27
[metricbeat] use relocated stable repo for kube-state-metrics (#882)
jmlrt Nov 3, 2020
fc57144
Add warning comment placeholder (7.x branch) (#887)
nkammah Nov 5, 2020
c67eb24
[meta] update rbac.authorization.k8s.io api (#890)
jmlrt Nov 10, 2020
2dad578
[meta] increase helm timeout (#891)
jmlrt Nov 12, 2020
2107d56
Helm 3 (#516) (#902)
jmlrt Nov 18, 2020
aefe09c
[meta] add link to eck chart doc (#910)
jmlrt Nov 18, 2020
bcc1208
[elasticsearch] update test hook annotations (#911)
jmlrt Nov 18, 2020
e208bab
[elasticsearch] Fix spelling (#897)
cospeedster Nov 18, 2020
1f42032
[meta] bump 7.x branch to 7.11.0-SNAPSHOT (#915)
jmlrt Nov 19, 2020
ba1b165
[7.x] [meta] upgrade test (#907) (#920)
jmlrt Nov 20, 2020
5f41b3e
[7.x] [meta] remove support for k8s <1.14 & helm <2.17.0 (#916) (#923)
jmlrt Nov 20, 2020
c57b5c9
[meta] remove version from dev install section title (#928)
jmlrt Nov 23, 2020
1618ff3
[meta] fix toc
jmlrt Nov 23, 2020
6dc0975
[7.x] [meta] stabilize CI tests (#935) (#938)
jmlrt Nov 25, 2020
c78b55a
[7.x] ES Statefulset empty initContainers fix (#795) (#943)
jmlrt Nov 26, 2020
dd5cf8e
[7.x] [logstash] add rbac custom annotations (#764) (#946)
jmlrt Nov 26, 2020
b75f2fc
[7.x] [meta] enable metricbeat upgrade test (#940) (#951)
jmlrt Dec 1, 2020
5bbbd90
[7.x] [apm-server] Add missing fields to HPA (#782) (#956)
jmlrt Dec 1, 2020
a62852a
[7.x] [kibana] add service.httpPortName config in chart (#843) (#959)
jmlrt Dec 1, 2020
a251320
[7.x] [meta] add config for backport (#971) (#974)
jmlrt Dec 10, 2020
d7dfd07
[7.x] [meta] bump helm to 3.4.2 (#977) (#988)
jmlrt Dec 18, 2020
86d6e17
[7.x] elasticsearch: add emptyDir to podSecurityPolicy as allowed vol…
jmlrt Dec 18, 2020
60a55aa
[7.x] [all] add hostaliases (#970) (#985)
jmlrt Dec 21, 2020
d1f1b59
Filebeat deployment support feature (#964) (#1005)
jmlrt Jan 5, 2021
73fff21
[filebeat] Configurable ClusterRole (#978) (#1007)
jmlrt Jan 5, 2021
d6f7844
[filebeat][metricbeat] Update documentation on port collisions for mu…
jmlrt Jan 6, 2021
ae7526c
[elasticsearch][kibana] Add flexible ingress (#994)
kevinsmithwrs Dec 22, 2020
ae168fd
Add support for NetworkPolicy. (#498)
desaintmartin Jan 4, 2021
2ce8f7f
[logstash] disable privileged container in psp (#1000)
jmlrt Jan 5, 2021
425b74f
[apm-server] run as non root user (#996)
jmlrt Jan 6, 2021
5c1f00c
[elasticsearch] fix secrets in config example (#1012)
jmlrt Jan 6, 2021
e5c936b
NIT Update backport config and small doc fixes (#1017)
jmlrt Jan 14, 2021
83edfe2
[filebeat] fix documentation
jmlrt Jan 14, 2021
b31bcf1
[meta] fix transient errors with stable repository (#1018)
jmlrt Jan 15, 2021
94d85b8
[meta] bump helm version to 3.5.0 (#1025)
jmlrt Jan 19, 2021
5e9889e
Fix post-lifecycle hook example (#1028)
artificial-aidan Jan 27, 2021
2ea2482
[meta] add build status and artifact hub badges (#1033)
jmlrt Jan 28, 2021
3824081
[filebeat] variable maxUnavailable updateStrategy (#809)
clemcvlcs Jan 28, 2021
316708d
[metricbeat] Fixing the respository of kube-state-metrics for metricb…
yousafsyed Feb 3, 2021
2a6af4c
fix: security.yaml is 404 (#1040)
daniel-hutao Feb 3, 2021
a2c1324
[elasticsearch][kibana] remove oss examples (#1046) (#1052)
jmlrt Feb 16, 2021
5092c2f
[7.x] [logstash] Add support to use pattern files (#883) (#1079)
jmlrt Feb 23, 2021
70f3d8e
[7.x] [meta] bump helm support to 3.5.2 (#1065) (#1082)
jmlrt Feb 23, 2021
fee836b
[7.x] [apm-server] Add option loadBalancerIP to service (#1075) (#1093)
jmlrt Mar 9, 2021
82a174c
[meta] bump 7.x branch to 7.12.0-SNAPSHOT (#1094)
jmlrt Mar 10, 2021
3ffc414
[meta] bump 7.x branch to 7.13.0-SNAPSHOT (#1114)
jmlrt Mar 18, 2021
8398eca
Remove slack notification
Conky5 Mar 23, 2021
b97d46e
[7.x] [meta] add tests for k8s 1.18 and remove 1.15 (#1141) (#1144)
jmlrt Apr 13, 2021
4b5bcad
[7.x] [meta] update PyYAML dependencies (#1140) (#1147)
jmlrt Apr 13, 2021
0294334
[7.x] [elasticsearch] heap size is no longer defaulted to 1g (#1135) …
jmlrt Apr 23, 2021
e38c292
[7.x] [meta] update backport config for 7.12 branch (#1112) (#1165)
jmlrt Apr 23, 2021
8f7af49
[7.x] [elasticsearch] Mark esMajorVersion as deprecated (#1109) (#1168)
jmlrt Apr 23, 2021
ca4c1c7
[7.x] [meta] add helm 3.5.3 support (#1128) (#1162)
jmlrt Apr 23, 2021
b763121
[7.x] Bump py from 1.8.0 to 1.10.0 in /helpers/helm-tester (#1154) (#…
jmlrt Apr 23, 2021
e24e7cf
[7.x] Bump py from 1.8.0 to 1.10.0 (#1155) (#1174)
jmlrt Apr 23, 2021
547a1b0
[7.x][logstash] Add option loadBalancerIP to service (#1099) (#1175)
nittyy May 10, 2021
6bacc55
[meta] remove gke 1.16 tests (#1184) (#1194)
jmlrt May 20, 2021
305a424
[meta] bump 7.x branch to 7.14.0-SNAPSHOT
jmlrt May 25, 2021
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
Prev Previous commit
Next Next commit
[elasticsearch][kibana] Add flexible ingress (#994)
Co-authored-by: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
  • Loading branch information
kevinsmithwrs and jmlrt committed Jan 12, 2021
commit ae7526ccfe9dcb9742a598c5961f85a4db90b629
20 changes: 18 additions & 2 deletions elasticsearch/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "elasticsearch.uname" . -}}
{{- $servicePort := .Values.httpPort -}}
{{- $httpPort := .Values.httpPort -}}
{{- $ingressPath := .Values.ingress.path -}}
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
Expand All @@ -17,22 +17,38 @@ metadata:
spec:
{{- if .Values.ingress.tls }}
tls:
{{- if .ingressPath }}
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- else }}
{{ toYaml .Values.ingress.tls | indent 4 }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
{{- if $ingressPath }}
- host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $servicePort }}
servicePort: {{ $httpPort }}
{{- else }}
- host: {{ .host }}
http:
paths:
{{- range .paths }}
- path: {{ .path }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ .servicePort | default $httpPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
48 changes: 48 additions & 0 deletions elasticsearch/tests/elasticsearch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,54 @@ def test_adding_a_node_affinity():

def test_adding_an_ingress_rule():
config = """
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
hosts:
- host: elasticsearch.elastic.co
paths:
- path: /
- host: ''
paths:
- path: /
- path: /mypath
servicePort: 8888
- host: elasticsearch.hello.there
paths:
- path: /
servicePort: 9999
tls:
- secretName: elastic-co-wildcard
hosts:
- elasticsearch.elastic.co
"""

r = helm_template(config)
assert uname in r["ingress"]
i = r["ingress"][uname]["spec"]
assert i["tls"][0]["hosts"][0] == "elasticsearch.elastic.co"
assert i["tls"][0]["secretName"] == "elastic-co-wildcard"

assert i["rules"][0]["host"] == "elasticsearch.elastic.co"
assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == uname
assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 9200
assert i["rules"][1]["host"] == None
assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == uname
assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 9200
assert i["rules"][1]["http"]["paths"][1]["path"] == "/mypath"
assert i["rules"][1]["http"]["paths"][1]["backend"]["serviceName"] == uname
assert i["rules"][1]["http"]["paths"][1]["backend"]["servicePort"] == 8888
assert i["rules"][2]["host"] == "elasticsearch.hello.there"
assert i["rules"][2]["http"]["paths"][0]["path"] == "/"
assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == uname
assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999


def test_adding_a_deprecated_ingress_rule():
config = """
ingress:
enabled: true
annotations:
Expand Down
5 changes: 3 additions & 2 deletions elasticsearch/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,10 @@ ingress:
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
path: /
hosts:
- chart-example.local
- host: chart-example.local
paths:
- path: /
tls: []
# - secretName: chart-example-tls
# hosts:
Expand Down
26 changes: 24 additions & 2 deletions kibana/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "kibana.fullname" . -}}
{{- $servicePort := .Values.service.port -}}
{{- $httpPort := .Values.httpPort -}}
{{- $ingressPath := .Values.ingress.path -}}
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
Expand All @@ -14,16 +14,38 @@ metadata:
spec:
{{- if .Values.ingress.tls }}
tls:
{{- if .ingressPath }}
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- else }}
{{ toYaml .Values.ingress.tls | indent 4 }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
{{- if $ingressPath }}
- host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $servicePort }}
servicePort: {{ $httpPort }}
{{- else }}
- host: {{ .host }}
http:
paths:
{{- range .paths }}
- path: {{ .path }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ .servicePort | default $httpPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
76 changes: 76 additions & 0 deletions kibana/tests/kibana_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,54 @@ def test_adding_a_extra_init_container():

def test_adding_an_ingress_rule():
config = """
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
hosts:
- host: kibana.elastic.co
paths:
- path: /
- path: /testpath
servicePort: 8888
- host: ''
paths:
- path: /
- host: kibana.hello.there
paths:
- path: /mypath
servicePort: 9999
tls:
- secretName: elastic-co-wildcard
hosts:
- kibana.elastic.co
"""

r = helm_template(config)
assert name in r["ingress"]
i = r["ingress"][name]["spec"]
assert i["tls"][0]["hosts"][0] == "kibana.elastic.co"
assert i["tls"][0]["secretName"] == "elastic-co-wildcard"

assert i["rules"][0]["host"] == "kibana.elastic.co"
assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
assert i["rules"][0]["http"]["paths"][1]["path"] == "/testpath"
assert i["rules"][0]["http"]["paths"][1]["backend"]["serviceName"] == name
assert i["rules"][0]["http"]["paths"][1]["backend"]["servicePort"] == 8888
assert i["rules"][1]["host"] == None
assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == name
assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 5601
assert i["rules"][2]["host"] == "kibana.hello.there"
assert i["rules"][2]["http"]["paths"][0]["path"] == "/mypath"
assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == name
assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999


def test_adding_a_deprecated_ingress_rule():
config = """
ingress:
enabled: true
annotations:
Expand Down Expand Up @@ -233,6 +281,34 @@ def test_adding_an_ingress_rule():

def test_adding_an_ingress_rule_wildcard():
config = """
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
hosts:
- host: kibana.elastic.co
paths:
- path: /
tls:
- secretName: elastic-co-wildcard
hosts:
- "*.elastic.co"
"""

r = helm_template(config)
assert name in r["ingress"]
i = r["ingress"][name]["spec"]
assert i["tls"][0]["hosts"][0] == "*.elastic.co"
assert i["tls"][0]["secretName"] == "elastic-co-wildcard"

assert i["rules"][0]["host"] == "kibana.elastic.co"
assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601


def test_adding_a_deprecated_ingress_rule_wildcard():
config = """
ingress:
enabled: true
annotations:
Expand Down
5 changes: 3 additions & 2 deletions kibana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@ ingress:
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
path: /
hosts:
- chart-example.local
- host: chart-example.local
paths:
- path: /
tls: []
# - secretName: chart-example-tls
# hosts:
Expand Down