Backport #390 #399 (#409)

* (Backport #390) feat: Add user-defined labels option to ingress Signed-off-by: Peter Zhu <[email protected]> * Updating the CODEOWNERS file (#399) Signed-off-by: bbarani <[email protected]> Signed-off-by: Peter Zhu <[email protected]> * Tweak changes Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: bbarani <[email protected]> Co-authored-by: Jason Witkowski <[email protected]> Co-authored-by: Barani <[email protected]>
opensearch-project · Mar 22, 2023 · 880a028 · 880a028
1 parent a5bfcd9
commit 880a028
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/engineering-effectiveness @TheAlgo @DandyDeveloper
+*   @bbarani @TheAlgo @DandyDeveloper @peterzhuamazon @prudhvigodithi @gaiksaya
diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md
@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [1.11.1]
+### Added
+### Changed
+- Allow user-defined labels on ingress resource
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [1.11.0]
 ### Added
 ### Changed
@@ -349,7 +358,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-dashboards-1.11.0...HEAD
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.11.1...HEAD
+[1.11.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.11.0...opensearch-1.11.1
 [1.11.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.10.0...opensearch-1.11.0
 [1.10.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.9.1...opensearch-1.10.0
 [1.9.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.9.0...opensearch-1.9.1

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: 1.11.0
+version: 1.11.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-dashboards/templates/ingress.yaml b/charts/opensearch-dashboards/templates/ingress.yaml
@@ -15,6 +15,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "opensearch-dashboards.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/opensearch-dashboards/values.yaml b/charts/opensearch-dashboards/values.yaml
@@ -162,6 +162,7 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  labels: {}
   hosts:
     - host: chart-example.local
       paths: