From b460fa41a139b8e0577cc65c449327e1d3111771 Mon Sep 17 00:00:00 2001 From: Prudhvi Godithi Date: Wed, 20 Dec 2023 12:34:10 -0800 Subject: [PATCH] Fix conflicts and update the chart to 2.17.2 Signed-off-by: Prudhvi Godithi --- charts/opensearch/CHANGELOG.md | 14 +++++++++++++- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/templates/ingress.yaml | 3 +++ charts/opensearch/values.yaml | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 67ebfe95..df75f452 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -12,6 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed ### Security + +--- +## [2.17.2] +### Added +- - Allow user-defined labels on ingress resource +### Changed +### Deprecated +### Removed +### Fixed +### Security --- ## [2.17.1] ### Added @@ -365,7 +375,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security -[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.17.1...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.17.2...HEAD +[2.17.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.17.1...opensearch-2.17.2 [2.17.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.17.0...opensearch-2.17.1 [2.17.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.16.1...opensearch-2.17.0 [2.16.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.16.0...opensearch-2.16.1 @@ -402,3 +413,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.2.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.1.0...opensearch-2.2.0 [2.1.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.0.1...opensearch-2.1.0 [2.0.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.0.0...opensearch-2.0.1 + diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 54242ed9..b40f6979 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.17.1 +version: 2.17.2 # 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/ingress.yaml b/charts/opensearch/templates/ingress.yaml index 7a4d0da8..d28c304e 100644 --- a/charts/opensearch/templates/ingress.yaml +++ b/charts/opensearch/templates/ingress.yaml @@ -16,6 +16,9 @@ metadata: name: {{ $fullName }} labels: {{- include "opensearch.labels" . | nindent 4 }} + {{- with .Values.ingress.ingressLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.ingress.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 9de9afde..6e235a5c 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -402,6 +402,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + ingressLabels: {} path: / hosts: - chart-example.local