From 05204b21c19ad563d707a08774ef0e8cd4f81dc5 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Wed, 8 Nov 2023 17:09:56 +0300
Subject: [PATCH] Add user-defined labels option to ingress (#498)

Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
---
 charts/opensearch/CHANGELOG.md           | 7 +++++++
 charts/opensearch/Chart.yaml             | 2 +-
 charts/opensearch/templates/ingress.yaml | 3 +++
 charts/opensearch/values.yaml            | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md
index 87ee8251..845768dd 100644
--- a/charts/opensearch/CHANGELOG.md
+++ b/charts/opensearch/CHANGELOG.md
@@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [2.17.1]
+### Added
+### Changed
+- Allow user-defined labels on ingress resource
+### Deprecated
+### Removed
+### Fixed
 ## [2.17.0]
 ### Added
 - Updated OpenSearch appVersion to 2.11.1
diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml
index a46d3189..54242ed9 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.0
+version: 2.17.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/ingress.yaml b/charts/opensearch/templates/ingress.yaml
index 7a4d0da8..0e1c546c 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.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 090cb0c8..bb51fcf3 100644
--- a/charts/opensearch/values.yaml
+++ b/charts/opensearch/values.yaml
@@ -392,6 +392,7 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  ingressLabels: {}
   path: /
   hosts:
     - chart-example.local