From 15a54d580f54a899dce36d57312f18ec46d98c96 Mon Sep 17 00:00:00 2001 From: Jason Witkowski Date: Sat, 18 Mar 2023 20:05:53 -0400 Subject: [PATCH] feat: Add user-defined labels option to ingress (#390) Signed-off-by: Jason Witkowski Co-authored-by: Jason Witkowski Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com> --- charts/opensearch-dashboards/CHANGELOG.md | 10 +++++++++- charts/opensearch-dashboards/Chart.yaml | 2 +- charts/opensearch-dashboards/templates/ingress.yaml | 3 +++ charts/opensearch-dashboards/values.yaml | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index 23286ac3..73c780eb 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- +## [2.9.1] +### Added +### Changed +- Allow user-defined labels on ingress resource +### Deprecated +### Removed +### Fixed +### Security +--- ## [2.9.0] ### Added ### Changed @@ -22,7 +31,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- ---- ## [2.8.0] ### Added ### Changed diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index e2d737b6..aa0d14bb 100644 --- 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: 2.9.0 +version: 2.9.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 index e7c7cfe1..47d3bde6 100644 --- 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 index bda9540a..cdc0b034 100644 --- 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: