Backport #390 #399 (#409)

* (Backport #390) feat: Add user-defined labels option to ingress

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Updating the CODEOWNERS file (#399)

Signed-off-by: bbarani <bbarani@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Tweak changes

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: bbarani <bbarani@amazon.com>
Co-authored-by: Jason Witkowski <jason@witkow.ski>
Co-authored-by: Barani <70038446+bbarani@users.noreply.github.com>

.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

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

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

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 }}

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: