From 77b3e6c76e938c16be2d24f767d2c89e53d84c72 Mon Sep 17 00:00:00 2001 From: Simon Stumpf <32813906+simonstumpf@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:34:42 +0200 Subject: [PATCH] Allow user-defined labels on pvcs (#591) * allow user-defined labels on pvcs Signed-off-by: Simon Stumpf * bummed version and updated changelog Signed-off-by: Simon Stumpf * apply additional pvc labels regardless if labels are enabled Signed-off-by: Simon Stumpf <32813906+simonstumpf@users.noreply.github.com> * updated changelog Signed-off-by: Simon Stumpf <32813906+simonstumpf@users.noreply.github.com> --------- Signed-off-by: Simon Stumpf Signed-off-by: Simon Stumpf <32813906+simonstumpf@users.noreply.github.com> --- charts/opensearch/CHANGELOG.md | 12 +++++++++++- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/templates/statefulset.yaml | 9 +++++++-- charts/opensearch/values.yaml | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 3901f06d..6b6af577 100644 --- 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.24.1] +### Added +- Allow user-defined labels on persistent volume claim +### Changed +### Deprecated +### Removed +### Fixed +### Security +======= ## [2.24.0] ### Added - Ability to add additional `labels` to `serviceMonitor` @@ -476,7 +485,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.24.0...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.24.1...HEAD +[2.24.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.24.0...opensearch-2.24.1 [2.24.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.1...opensearch-2.24.0 [2.23.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.1...opensearch-2.23.2 [2.23.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.23.0...opensearch-2.23.1 diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 66879da1..524c074b 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.24.0 +version: 2.24.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/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 72e14976..3ce437fc 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -27,9 +27,14 @@ spec: volumeClaimTemplates: - metadata: name: {{ template "opensearch.uname" . }} - {{- if .Values.persistence.labels.enabled }} + {{- if or .Values.persistence.labels.enabled .Values.persistence.labels.additionalLabels }} labels: - {{- include "opensearch.labels" . | nindent 8 }} + {{- if .Values.persistence.labels.enabled }} + {{- include "opensearch.labels" . | nindent 8 }} + {{- end }} + {{- with .Values.persistence.labels.additionalLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- end }} {{- with .Values.persistence.annotations }} annotations: diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index e943bb91..02e356f4 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -205,6 +205,8 @@ persistence: labels: # Add default labels for the volumeClaimTemplate of the StatefulSet enabled: false + # Add custom labels for the volumeClaimTemplate of the StatefulSet + additionalLabels: {} # OpenSearch Persistent Volume Storage Class # If defined, storageClassName: # If set to "-", storageClassName: "", which disables dynamic provisioning