diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index d12d33a4..bcaa4529 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -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 diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index 89449933..11bae65b 100644 --- a/charts/opensearch-dashboards/Chart.yaml +++ b/charts/opensearch-dashboards/Chart.yaml @@ -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 diff --git a/charts/opensearch-dashboards/README.md b/charts/opensearch-dashboards/README.md index b2ba75bf..e72447f4 100644 --- a/charts/opensearch-dashboards/README.md +++ b/charts/opensearch-dashboards/README.md @@ -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 diff --git a/charts/opensearch-dashboards/templates/deployment.yaml b/charts/opensearch-dashboards/templates/deployment.yaml index adef02f4..e870fe56 100644 --- a/charts/opensearch-dashboards/templates/deployment.yaml +++ b/charts/opensearch-dashboards/templates/deployment.yaml @@ -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: @@ -204,4 +208,4 @@ spec: {{- else }} {{ toYaml .Values.extraContainers | indent 6 }} {{- end }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/opensearch-dashboards/values.yaml b/charts/opensearch-dashboards/values.yaml index 0f765b41..beacd84e 100644 --- a/charts/opensearch-dashboards/values.yaml +++ b/charts/opensearch-dashboards/values.yaml @@ -67,6 +67,9 @@ secretMounts: [] podAnnotations: {} +# Deployment annotations +dashboardAnnotations: {} + extraEnvs: [] # - name: "NODE_OPTIONS" # value: "--max-old-space-size=1800" diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 02508287..9e1ceb96 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -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 diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 642ade63..cb8230e6 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/Chart.yaml @@ -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 diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md index 5e1bb25b..2a3aee35 100644 --- a/charts/opensearch/README.md +++ b/charts/opensearch/README.md @@ -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 diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index cc93e05c..68843eeb 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -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: diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 96802a12..dbdfcc95 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -132,6 +132,9 @@ image: podAnnotations: {} # iam.amazonaws.com/role: es-cluster +# OpenSearch Statefulset annotations +openSearchAnnotations: {} + # additionals labels labels: {}