Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add user-defined labels option to ingress #390

Conversation

jwitko
Copy link
Contributor

@jwitko jwitko commented Feb 27, 2023

Fixes #394

Description

Add user-defined labels capability to opensearch-dashboard helm chart

Issues Resolved

Some users filter for certain things based off ingress labels for example with external-dns. It would be nice to be able to define extra labels for the ingress resource.

Check List

  • Commits are signed per the DCO using --signoff

For any changes to files within Helm chart directories:

  • Helm chart version bumped
  • Helm chart CHANGELOG.md updated to reflect change

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Copy link
Member

@TheAlgo TheAlgo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jwitko thanks for your contribution, can you please add an issue to your PR so that we know exactly about the use case and it helps us track releases in the right way.

@jwitko
Copy link
Contributor Author

jwitko commented Mar 2, 2023

Hi @jwitko thanks for your contribution, can you please add an issue to your PR so that we know exactly about the use case and it helps us track releases in the right way.

@TheAlgo Sure no problem. Issue created and linked to this PR. #394

@jwitko jwitko requested review from TheAlgo and removed request for DandyDeveloper March 2, 2023 15:19
@jwitko
Copy link
Contributor Author

jwitko commented Mar 2, 2023

@DandyDeveloper Sorry... not sure why it removed you as a reviewer request. I did not do that intentionally, I just re-requested a review from @TheAlgo

@prudhvigodithi
Copy link
Collaborator

LGTM!, thanks, @TheAlgo please review.
Thank you

@prudhvigodithi
Copy link
Collaborator

Adding @peterzhuamazon @DandyDeveloper

@TheAlgo
Copy link
Member

TheAlgo commented Mar 18, 2023

@prudhvigodithi @DandyDeveloper Could you guys please take a look at it?

@prudhvigodithi
Copy link
Collaborator

LGTM, thanks @jwitko, can you also backport to 1.x?

@prudhvigodithi prudhvigodithi merged commit af3ca13 into opensearch-project:main Mar 19, 2023
@jwitko jwitko deleted the feature/add-custom-ingress-labels-opensearch-dashboard branch March 20, 2023 14:42
peterzhuamazon pushed a commit to peterzhuamazon/helm-charts that referenced this pull request Mar 22, 2023
…n to ingress

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon mentioned this pull request Mar 22, 2023
3 tasks
@peterzhuamazon
Copy link
Member

1.x backport:

peterzhuamazon added a commit that referenced this pull request Mar 22, 2023
* (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>
prathaptce pushed a commit to prathaptce/helm-charts that referenced this pull request Mar 23, 2023
Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>
prathaptce pushed a commit to prathaptce/helm-charts that referenced this pull request Mar 24, 2023
Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>
prathaptce pushed a commit to prathaptce/helm-charts that referenced this pull request Mar 24, 2023
Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>
prathaptce pushed a commit to prathaptce/helm-charts that referenced this pull request Mar 24, 2023
Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>
bbarani added a commit that referenced this pull request Apr 24, 2023
* Update appVersion for 2.4.0 release (#350)

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Add .whitesource configuration file (#353)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Resolve Kind Cluster not able to be built in PR checks (#356)

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

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Fix the kindest/node docker images versions (#357)

* Resolve Kind Cluster not able to be built in PR checks

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

* Fix the kindest/node versions on docker images

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

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Resolve Kind Cluster not able to be built in PR checks (#358)

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

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* allow adding plugins and change defaultmode for opensearch dashboards (#342)

* allow adding plugins and change defaultmode for opensearch dashboards yaml file

Signed-off-by: Lu Yu <nluyu@amazon.com>

* bump version and update changelog

Signed-off-by: Lu Yu <nluyu@amazon.com>

* add new line

Signed-off-by: Lu Yu <nluyu@amazon.com>

* bump version for os

Signed-off-by: Lu Yu <nluyu@amazon.com>

* resolve conflict in changelog

Signed-off-by: Lu Yu <nluyu@amazon.com>

* trigger build

Signed-off-by: Lu Yu <nluyu@amazon.com>

Signed-off-by: Lu Yu <nluyu@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Fix path in securityConfig section on OpenSearch (values.yaml) (#344)

* fix securityConfig.path

Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com>

* add link to issue

Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com>

Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update appVersion to 2.4.1 (#363)

* Update appVersion to 2.4.1

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Update appVersion to 2.4.1

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Fix changelog

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Fix changelog

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

* Fix version

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Fix version for OpenSearch

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Fix version for OpenSearch-Dasboards

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Add hostPort support for http- and transport-ports (#336)

Signed-off-by: Christian Kuhn <phello@gmx.de>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updated MAINTAINERS.md to match recommended opensearch-project format. (#367)

Signed-off-by: dblock <dblock@amazon.com>

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Bump OS and OSD version to 2.5.0 (#373)

Signed-off-by: Rishabh Singh <sngri@amazon.com>

Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Created untriaged issue workflow. (#382)

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Bump OpenSearch and Dashboards to 2.6.0 (#393)

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updating the CODEOWNERS file (#399)

Signed-off-by: bbarani <bbarani@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Add lifecycle support in opensearch container (#376)

* Add lifecycle support in opensearch container

Signed-off-by: josephteddick <josephteddick@gmail.com>

* lifecycle support PR cleanup

Signed-off-by: josephteddick <josephteddick@gmail.com>

---------

Signed-off-by: josephteddick <josephteddick@gmail.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

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

Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update deployment.yaml

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update values.yaml

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update values.yaml

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update statefulset.yaml

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updating chart version and changelog.md

Signed-off-by: Prathap Mahalingam (Nokia) <prathap.mahalingam@nokia.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Add lifecycle support in opensearch container (#376)

* Add lifecycle support in opensearch container

Signed-off-by: josephteddick <josephteddick@gmail.com>

* lifecycle support PR cleanup

Signed-off-by: josephteddick <josephteddick@gmail.com>

---------

Signed-off-by: josephteddick <josephteddick@gmail.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Add github-merit-badger.yml (#408)

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Service port for performance analyzer (#346)

* Performance analyzer port mapping

Signed-off-by: Philipp Hölscher <phoelsch@outlook.de>

* Performance analyzer port on ci-values

Signed-off-by: Philipp Hölscher <phoelsch@outlook.de>

* Update changelog

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

---------

Signed-off-by: Philipp Hölscher <phoelsch@outlook.de>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Incorporated the review comments

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Update values.yaml

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Incorporated the review comments

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Correcting the merge conflicts

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updated the README.md for OpenSearch & Dashboard

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updated the changelog message

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

* Updating the version number

Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>

---------

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: prathaptce <86703966+prathaptce@users.noreply.github.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Lu Yu <nluyu@amazon.com>
Signed-off-by: Ruslan Gainanov <gromrx1@gmail.com>
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: Christian Kuhn <phello@gmx.de>
Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: bbarani <bbarani@amazon.com>
Signed-off-by: josephteddick <josephteddick@gmail.com>
Signed-off-by: Jason Witkowski <jwitkowski@zscaler.com>
Signed-off-by: Prathap Mahalingam (Nokia) <prathap.mahalingam@nokia.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Philipp Hölscher <phoelsch@outlook.de>
Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Lu Yu <yulu.nju@gmail.com>
Co-authored-by: Ruslan Gainanov <gromrx1@gmail.com>
Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com>
Co-authored-by: Sayali Gaikawad <gaiksaya@amazon.com>
Co-authored-by: Christian Kuhn <86721442+ph311o@users.noreply.github.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@dblock.org>
Co-authored-by: Rishabh Singh <rishabhksingh@gmail.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Barani <70038446+bbarani@users.noreply.github.com>
Co-authored-by: Joseph Teddick <43552317+josephteddick@users.noreply.github.com>
Co-authored-by: Jason Witkowski <jason@witkow.ski>
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Co-authored-by: Philipp Hölscher <46397932+Phoelsch@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Enhancement][opensearch] Allow user-defined labels on ingress resource
4 participants