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

Support to add Kibana annotations at deployment level #1417

Merged
merged 22 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 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
7ad2496
Adding support to annotation on Kibana deploymet
framsouza Oct 14, 2021
ef9e27d
fixing syntax
framsouza Oct 15, 2021
851231c
Merge branch 'elastic:main' into main
framsouza Nov 5, 2021
58f9342
Merge branch 'main' into kibana-deployment-annotation
framsouza Nov 16, 2021
32065b5
Fixing as per reviewer request
framsouza Nov 16, 2021
dba007a
Adding kibana tests & annotations at README
framsouza Nov 16, 2021
fceb146
Merge remote-tracking branch 'origin/main' into kibana-deployment-ann…
jmlrt Mar 3, 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
1 change: 1 addition & 0 deletions kibana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ as a reference. They are also used in the automated testing of this chart.
| Parameter | Description | Default |
|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|
| `affinity` | Configurable [affinity][] | `{}` |
| `annotations` | Configurable [annotations][] on the deployment object | `{}` |
| `automountToken` | Whether or not to automount the service account token in the Pod | `true` |
| `elasticsearchHosts` | The URLs used to connect to Elasticsearch | `http://elasticsearch-master:9200` |
| `envFrom` | Templatable string to be passed to the [environment from variables][] which will be appended to the `envFrom:` definition for the container | `[]` |
Expand Down
6 changes: 6 additions & 0 deletions kibana/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ kind: Deployment
metadata:
name: {{ template "kibana.fullname" . }}
labels: {{ include "kibana.labels" . | nindent 4 }}
{{- if .Values.annotations }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
spec:
replicas: {{ .Values.replicas }}
strategy:
Expand Down
12 changes: 12 additions & 0 deletions kibana/tests/kibana_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -836,3 +836,15 @@ def test_disable_automount_sa_token():
]
== False
)


def test_adding_annotations():
config = """
annotations:
iam.amazonaws.com/role: es-role
"""
r = helm_template(config)
assert (
r["deployment"][name]["metadata"]["annotations"]["iam.amazonaws.com/role"]
== "es-role"
)
2 changes: 2 additions & 0 deletions kibana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ imagePullPolicy: "IfNotPresent"
# additionals labels
labels: {}

annotations: {}

podAnnotations: {}
# iam.amazonaws.com/role: es-cluster

Expand Down