feat(chart/opensearch): add ability for serviceMonitor basicauth

Signed-off-by: Toni Tauro <toni.tauro@adfinis.com>
opensearch-project · Dec 13, 2024 · 642e18b · 642e18b
1 parent 8d802b8
commit 642e18b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md
@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.28.0]
+### Added
+- Ability to set a basic auth configuration to the `serviceMonitor`
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [2.27.1]
 ### Added
 ### Changed
@@ -530,7 +539,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
-[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.1...HEAD
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.28.0...HEAD
+[2.28.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.0...opensearch-2.28.0
 [2.27.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.0...opensearch-2.27.1
 [2.27.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.26.1...opensearch-2.27.0
 [2.26.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.26.0...opensearch-2.26.1

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.27.1
+version: 2.28.1
 
 # 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/templates/serviceMonitor.yaml b/charts/opensearch/templates/serviceMonitor.yaml
@@ -17,4 +17,13 @@ spec:
   - port: {{ .Values.service.metricsPortName | default "metrics" }}
     interval: {{ .Values.serviceMonitor.interval }}
     path: {{ .Values.serviceMonitor.path }}
+    {{- if .Values.serviceMonitor.basicAuth }}
+    basicAuth:
+      username: 
+        name: {{ .Values.serviceMonitor.basicAuth.username.secretName}}
+        key: {{ .Values.serviceMonitor.basicAuth.username.secretKey}}
+      password:
+        name: {{ .Values.serviceMonitor.basicAuth.password.secretName}}
+        key: {{ .Values.serviceMonitor.basicAuth.password.secretKey}}
+    {{- end }}
 {{- end }}
diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml
@@ -550,3 +550,13 @@ serviceMonitor:
   # labels:
   #  k8s.example.com/prometheus: kube-prometheus
   labels: {}
+
+  # Basic Auth configuration for the service monitor
+  # basicAuth:
+  #   username:
+  #     secretName: credentials
+  #     secretKey: username
+  #   password:
+  #     secretName: credentials
+  #     secretKey: password
+  basicAuth: {}