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

[metricbeat] Adding custerRole permissions for leader election #1422

Merged
merged 20 commits into from
Mar 3, 2022
Merged

[metricbeat] Adding custerRole permissions for leader election #1422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3219977
Adding support to Ingress networking.k8s.io/v1
framsouza Oct 11, 2021
ca298fd
Adjusting ES service name
framsouza Oct 11, 2021
1caaa02
Removing ingress typo & adjusting python test
framsouza Oct 11, 2021
4b2b7bf
Adjusting python tests to use the new ingress version
framsouza Oct 11, 2021
2611e28
fixing conflict
framsouza Oct 12, 2021
3843441
fixing conflict
framsouza Oct 12, 2021
1391790
Merge branch 'elastic-master'
framsouza Oct 12, 2021
af7de17
Adding support to kubernetes ingress v1 & ClassName
framsouza Oct 12, 2021
10ee16d
Adding reformatted files
framsouza Oct 12, 2021
6407ff9
Merge branch 'elastic:master' into master
framsouza Oct 12, 2021
aefb05e
fixing conflict
framsouza Oct 12, 2021
eb96b28
Adding ClassName & Pathtype on ingress settings
framsouza Oct 13, 2021
027448f
Merge branch 'elastic:master' into master
framsouza Oct 13, 2021
a6be99c
Performing syntax adjustments and removing comments
framsouza Oct 13, 2021
795095a
Merge branch 'elastic:main' into main
framsouza Oct 14, 2021
d164d6c
custerRole permissions for leader election in k8s 1.19+
framsouza Oct 18, 2021
851231c
Merge branch 'elastic:main' into main
framsouza Nov 5, 2021
9913e21
Merge branch 'main' into adjusting-roles
framsouza Nov 16, 2021
5ae9a7c
Adding fb & mb role
framsouza Nov 16, 2021
f0a613c
Merge remote-tracking branch 'origin/main' into adjusting-roles
jmlrt Feb 28, 2022
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
Removing ingress typo & adjusting python test
  • Loading branch information
@framsouza
framsouza committed Oct 11, 2021
commit 1caaa0253832289b6bb7b0736ff0f17de52bb576
2 changes: 1 addition & 1 deletion elasticsearch/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
service:
name: {{ $fullName }}
port:
number:: {{ $httpPort }}
number: {{ $httpPort }}
{{- else }}
- host: {{ .host }}
http:
Expand Down
20 changes: 10 additions & 10 deletions elasticsearch/tests/elasticsearch_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,19 +644,19 @@ def test_adding_an_ingress_rule():

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"][0]["http"]["paths"][0]["backend"]["service"]["name"] == uname
assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 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"][0]["backend"]["service"]["name"] == uname
assert i["rules"][1]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 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"][1]["http"]["paths"][1]["backend"]["service"]["name"] == uname
assert i["rules"][1]["http"]["paths"][1]["backend"]["service"]["port"]["number"] == 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
assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["name"] == uname
assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 9999


def test_adding_a_deprecated_ingress_rule():
Expand All @@ -682,8 +682,8 @@ def test_adding_a_deprecated_ingress_rule():

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"][0]["http"]["paths"][0]["backend"]["service"]["name"] == uname
assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 9200


def test_changing_the_protocol():
Expand Down