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.

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

Customize opensearch deployment annotation through values.yaml #407

Merged
merged 35 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1778eb5
Update appVersion for 2.4.0 release (#350)
zelinh Nov 15, 2022
7bcb231
Add .whitesource configuration file (#353)
mend-for-github-com[bot] Dec 2, 2022
87434d3
Resolve Kind Cluster not able to be built in PR checks (#356)
peterzhuamazon Dec 7, 2022
ab723c7
Fix the kindest/node docker images versions (#357)
peterzhuamazon Dec 7, 2022
8cc47ad
Resolve Kind Cluster not able to be built in PR checks (#358)
peterzhuamazon Dec 8, 2022
2e6f990
allow adding plugins and change defaultmode for opensearch dashboards…
BionIT Dec 8, 2022
857a155
Fix path in securityConfig section on OpenSearch (values.yaml) (#344)
GRomR1 Dec 8, 2022
6e30028
Update appVersion to 2.4.1 (#363)
gaiksaya Dec 13, 2022
b417319
Fix version for OpenSearch
gaiksaya Dec 13, 2022
93fa81e
Fix version for OpenSearch-Dasboards
gaiksaya Dec 13, 2022
c3a6fd0
Add hostPort support for http- and transport-ports (#336)
ph311o Jan 3, 2023
5d8f377
Updated MAINTAINERS.md to match recommended opensearch-project format…
dblock Jan 6, 2023
18a29bc
Bump OS and OSD version to 2.5.0 (#373)
rishabh6788 Jan 24, 2023
7d3a54c
Created untriaged issue workflow. (#382)
dblock Feb 14, 2023
d6e05a2
Bump OpenSearch and Dashboards to 2.6.0 (#393)
gaiksaya Feb 28, 2023
24c5b51
Updating the CODEOWNERS file (#399)
bbarani Mar 10, 2023
e39afb3
Add lifecycle support in opensearch container (#376)
josephteddick Mar 14, 2023
61269fa
feat: Add user-defined labels option to ingress (#390)
jwitko Mar 19, 2023
19533d3
Update deployment.yaml
prathaptce Mar 21, 2023
e6deb56
Update values.yaml
prathaptce Mar 21, 2023
1d130d2
Update values.yaml
prathaptce Mar 21, 2023
b6b2e51
Update statefulset.yaml
prathaptce Mar 21, 2023
3eef10f
Updating chart version and changelog.md
prathaptce Mar 23, 2023
75434b8
Add lifecycle support in opensearch container (#376)
josephteddick Mar 14, 2023
1e5a321
Add github-merit-badger.yml (#408)
prudhvigodithi Mar 21, 2023
7d1c73d
Service port for performance analyzer (#346)
Phoelsch Mar 22, 2023
ef98afa
Incorporated the review comments
prathaptce Mar 24, 2023
9ab6632
Update values.yaml
prathaptce Mar 21, 2023
c70eb17
Incorporated the review comments
prathaptce Mar 24, 2023
d5c758a
Merge remote-tracking branch 'upstream/main' into prathaptce-patch-1-1
prathaptce Mar 24, 2023
4b39220
Correcting the merge conflicts
prathaptce Mar 24, 2023
d45740f
Updated the README.md for OpenSearch & Dashboard
prathaptce Mar 24, 2023
47a172f
Updated the changelog message
prathaptce Mar 24, 2023
ad01026
Merge branch 'main' into prathaptce-patch-1-1
prathaptce Mar 29, 2023
4181432
Updating the version number
prathaptce Mar 29, 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
9 changes: 9 additions & 0 deletions charts/opensearch-dashboards/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security
---
## [2.9.3]
### Added
- Added custom opensearch and dashboard annotations through values.yaml
### Changed
### Deprecated
### Removed
### Fixed
### Security
---
## [2.9.2]
### Added
- Support setting ipFamilyPolicy on Service
Expand Down
2 changes: 1 addition & 1 deletion charts/opensearch-dashboards/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.9.2
version: 2.9.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
1 change: 1 addition & 0 deletions charts/opensearch-dashboards/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
| `plugins.enabled` | Allow/disallow to add 3rd Party / Custom plugins not offered in the default OpenSearchDashboards image | false |
| `plugins.installList` | Array containing the Opensearch Dashboards plugins to be installed in container | [] |
| `opensearchDashboardsYml.defaultMode` | Allow you to set the defaultMode for the opensearch_dashboards.yml mounted as configMap | |
| `dashboardAnnotations` | Allows you to configure custom annotation in the deployement of the OpenSearchDashboards container | {} |

[probe]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes

Expand Down
6 changes: 5 additions & 1 deletion charts/opensearch-dashboards/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: Deployment
metadata:
name: {{ template "opensearch-dashboards.fullname" . }}
labels: {{- include "opensearch-dashboards.labels" . | nindent 4 }}
{{- with .Values.dashboardAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
strategy:
Expand Down Expand Up @@ -204,4 +208,4 @@ spec:
{{- else }}
{{ toYaml .Values.extraContainers | indent 6 }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/opensearch-dashboards/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ secretMounts: []

podAnnotations: {}

# Deployment annotations
dashboardAnnotations: {}

extraEnvs: []
# - name: "NODE_OPTIONS"
# value: "--max-old-space-size=1800"
Expand Down
9 changes: 9 additions & 0 deletions charts/opensearch/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security
---
## [2.11.4]
### Added
- Added custom opensearch deployment annotation through values.yaml
### Changed
### Deprecated
### Removed
### Fixed
### Security
---
## [2.11.3]
### Added
- Support setting ipFamilyPolicy on Service
Expand Down
2 changes: 1 addition & 1 deletion charts/opensearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.11.3
version: 2.11.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
1 change: 1 addition & 0 deletions charts/opensearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ helm uninstall my-release
| `plugins.enabled` | Allow/disallow to add 3rd Party / Custom plugins not offered in the default OpenSearchDashboards image | false |
| `plugins.installList` | Array containing the Opensearch Dashboards plugins to be installed in container | [] |
| `opensearchLifecycle` | Allows you to configure lifecycle hooks for the OpenSearch container in the StatefulSet | {} |
| `openSearchAnnotations` | Allows you to configure custom annotation in the StatefullSet of the OpenSearch container | {} |


[anti-affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
Expand Down
3 changes: 3 additions & 0 deletions charts/opensearch/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ metadata:
{{- include "opensearch.labels" . | nindent 4 }}
annotations:
majorVersion: "{{ include "opensearch.majorVersion" . }}"
{{- with .Values.openSearchAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
serviceName: {{ template "opensearch.serviceName" . }}-headless
selector:
Expand Down
3 changes: 3 additions & 0 deletions charts/opensearch/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ image:
podAnnotations: {}
# iam.amazonaws.com/role: es-cluster

# OpenSearch Statefulset annotations
openSearchAnnotations: {}

# additionals labels
labels: {}

Expand Down