Customize opensearch deployment annotation through values.yaml (#407)

* Update appVersion for 2.4.0 release (#350) Signed-off-by: Zelin Hao <zelinhao@amazon.com> Signed-off-by: Zelin Hao <zelinhao@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Add .whitesource configuration file (#353) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Resolve Kind Cluster not able to be built in PR checks (#356) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Fix the kindest/node docker images versions (#357) * Resolve Kind Cluster not able to be built in PR checks Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Fix the kindest/node versions on docker images Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Resolve Kind Cluster not able to be built in PR checks (#358) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * allow adding plugins and change defaultmode for opensearch dashboards (#342) * allow adding plugins and change defaultmode for opensearch dashboards yaml file Signed-off-by: Lu Yu <nluyu@amazon.com> * bump version and update changelog Signed-off-by: Lu Yu <nluyu@amazon.com> * add new line Signed-off-by: Lu Yu <nluyu@amazon.com> * bump version for os Signed-off-by: Lu Yu <nluyu@amazon.com> * resolve conflict in changelog Signed-off-by: Lu Yu <nluyu@amazon.com> * trigger build Signed-off-by: Lu Yu <nluyu@amazon.com> Signed-off-by: Lu Yu <nluyu@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Fix path in securityConfig section on OpenSearch (values.yaml) (#344) * fix securityConfig.path Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com> * add link to issue Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com> Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update appVersion to 2.4.1 (#363) * Update appVersion to 2.4.1 Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> * Update appVersion to 2.4.1 Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> * Fix changelog Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> * Fix changelog Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> * Fix version Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Fix version for OpenSearch Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Fix version for OpenSearch-Dasboards Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Add hostPort support for http- and transport-ports (#336) Signed-off-by: Christian Kuhn <phello@gmx.de> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updated MAINTAINERS.md to match recommended opensearch-project format. (#367) Signed-off-by: dblock <dblock@amazon.com> Signed-off-by: dblock <dblock@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Bump OS and OSD version to 2.5.0 (#373) Signed-off-by: Rishabh Singh <sngri@amazon.com> Signed-off-by: Rishabh Singh <sngri@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Created untriaged issue workflow. (#382) Signed-off-by: dblock <dblock@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Bump OpenSearch and Dashboards to 2.6.0 (#393) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updating the CODEOWNERS file (#399) Signed-off-by: bbarani <bbarani@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Add lifecycle support in opensearch container (#376) * Add lifecycle support in opensearch container Signed-off-by: josephteddick <josephteddick@gmail.com> * lifecycle support PR cleanup Signed-off-by: josephteddick <josephteddick@gmail.com> --------- Signed-off-by: josephteddick <josephteddick@gmail.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * feat: Add user-defined labels option to ingress (#390) Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com> Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update deployment.yaml Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update values.yaml Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update values.yaml Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update statefulset.yaml Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updating chart version and changelog.md Signed-off-by: Prathap Mahalingam (Nokia) <prathap.mahalingam@nokia.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Add lifecycle support in opensearch container (#376) * Add lifecycle support in opensearch container Signed-off-by: josephteddick <josephteddick@gmail.com> * lifecycle support PR cleanup Signed-off-by: josephteddick <josephteddick@gmail.com> --------- Signed-off-by: josephteddick <josephteddick@gmail.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Add github-merit-badger.yml (#408) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Service port for performance analyzer (#346) * Performance analyzer port mapping Signed-off-by: Philipp Hölscher <phoelsch@outlook.de> * Performance analyzer port on ci-values Signed-off-by: Philipp Hölscher <phoelsch@outlook.de> * Update changelog Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Philipp Hölscher <phoelsch@outlook.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Incorporated the review comments Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Update values.yaml Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Incorporated the review comments Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Correcting the merge conflicts Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updated the README.md for OpenSearch & Dashboard Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updated the changelog message Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> * Updating the version number Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> --------- Signed-off-by: Zelin Hao <zelinhao@amazon.com> Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Lu Yu <nluyu@amazon.com> Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com> Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: Christian Kuhn <phello@gmx.de> Signed-off-by: dblock <dblock@amazon.com> Signed-off-by: Rishabh Singh <sngri@amazon.com> Signed-off-by: bbarani <bbarani@amazon.com> Signed-off-by: josephteddick <josephteddick@gmail.com> Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com> Signed-off-by: Prathap Mahalingam (Nokia) <prathap.mahalingam@nokia.com> Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: Philipp Hölscher <phoelsch@outlook.de> Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Lu Yu <yulu.nju@gmail.com> Co-authored-by: Ruslan Gainanov <gromrx1@gmail.com> Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com> Co-authored-by: Sayali Gaikawad <gaiksaya@amazon.com> Co-authored-by: Christian Kuhn <86721442+ph311o@users.noreply.github.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@dblock.org> Co-authored-by: Rishabh Singh <rishabhksingh@gmail.com> Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com> Co-authored-by: Barani <70038446+bbarani@users.noreply.github.com> Co-authored-by: Joseph Teddick <43552317+josephteddick@users.noreply.github.com> Co-authored-by: Jason Witkowski <jason@witkow.ski> Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com> Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com> Co-authored-by: Philipp Hölscher <46397932+Phoelsch@users.noreply.github.com>
opensearch-project · Apr 24, 2023 · d5c3493 · d5c3493
1 parent 974a1d5
commit d5c3493
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}
+      {{- end }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -132,6 +132,9 @@ image:
 podAnnotations: {}
   # iam.amazonaws.com/role: es-cluster
 
+# OpenSearch Statefulset annotations
+openSearchAnnotations: {}
+
 # additionals labels
 labels: {}