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

Add lifecycle hooks to opensearch dashboard helm chart #145

Merged
merged 13 commits into from
Aug 2, 2022

Conversation

bluehawk27
Copy link
Contributor

@bluehawk27 bluehawk27 commented Nov 24, 2021

Description

[Describe what this change achieves]
Adds lifcycle hook that is currently supported in the helm template https://github.com/opensearch-project/helm-charts/blob/main/charts/opensearch-dashboards/templates/deployment.yaml#L140

Issues Resolved

[List any issues this PR will resolve]
#144

Check List

  • Commits are signed per the DCO using --signoff

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.

gdm and others added 2 commits November 24, 2021 15:37
…roject#139)

* Fix url to values.yaml in README.md in opensearch chart

Signed-off-by: Dmytro Gorbunov <dmytro.gorbunov@gmail.com>

* Make URL to values.yaml in README.md more consistent (with reference section)

Signed-off-by: Dmytro Gorbunov <dmytro.gorbunov@gmail.com>

* Increment the Chart version and update the Changelog

Signed-off-by: Dmytro Gorbunov <dmytro.gorbunov@gmail.com>

* Update version of opensearch chart after resolving merge conflict

Signed-off-by: Dmytro Gorbunov <dmytro.gorbunov@gmail.com>

Co-authored-by: Dmytro Gorbunov <dmytro.gorbunov@gmail.com>
Signed-off-by: bluehawk27 <alberto@doc.ai>
Signed-off-by: bluehawk27 <alberto@doc.ai>
charts/opensearch-dashboards/values.yaml Outdated Show resolved Hide resolved
charts/opensearch/CHANGELOG.md Outdated Show resolved Hide resolved
@peterzhuamazon
Copy link
Member

Hi @bluehawk27 this is a change in dashboards but your version bump and change logs are modified in opensearch. Can you correct this in the corresponding files of opensearch-dashboards folder?

Thanks.

Copy link
Collaborator

@DandyDeveloper DandyDeveloper left a comment

Choose a reason for hiding this comment

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

Looks great, but I have some requests.

Only other thing - We need to add the values for the lifecycle to the README.md

charts/opensearch-dashboards/values.yaml Show resolved Hide resolved
charts/opensearch-dashboards/values.yaml Show resolved Hide resolved
charts/opensearch/CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: bluehawk27 <alberto@doc.ai>
Signed-off-by: bluehawk27 <alberto@doc.ai>
@peterzhuamazon
Copy link
Member

Seeing a lot of conflicts here.
Can you try to resolve them @bluehawk27 ?
Thanks.

@DandyDeveloper
Copy link
Collaborator

I neglected to follow up on this. If @bluehawk27 doesn't get a chance I'll fix the conflicts tomorrow.

@bluehawk27
Copy link
Contributor Author

@DandyDeveloper @peterzhuamazon does every PR require a chart version bump? This PR doesn't materially change the chart behavior. It more or less just documents existing behavior.

@peterzhuamazon
Copy link
Member

@DandyDeveloper @peterzhuamazon does every PR require a chart version bump? This PR doesn't materially change the chart behavior. It more or less just documents existing behavior.

Yes @bluehawk27
#152 (comment)

@bluehawk27
Copy link
Contributor Author

ok thank you for answering @peterzhuamazon . I can't keep resolving conflicts every time another PR gets merged in before this one so let me know when you plan on merging it in and I'll do a version bump.

@peterzhuamazon
Copy link
Member

ok thank you for answering @peterzhuamazon . I can't keep resolving conflicts every time another PR gets merged in before this one so let me know when you plan on merging it in and I'll do a version bump.

Reserve 1.5.8 for you @bluehawk27 we are also trying to improve the process, sorry about confusion.
We will merge your PR once #159 #84 #179 merged.

Thanks.

@peterzhuamazon
Copy link
Member

@DandyDeveloper @TheAlgo please look at this PR and see if @bluehawk27 has resolved all issues.
Once you guys approve I will fix the versions and merge it.

Thanks.

@peterzhuamazon
Copy link
Member

@DandyDeveloper @TheAlgo poke on this PR again as it sits for a while.
Could you guys check the code and see if we can proceed?
Ignore version conflicts.

Thanks.

@NybbleHub
Copy link
Contributor

Hi guys,

Any news on this pull request ? Could be really good to have lifecycle block :)

Thanks !

@peterzhuamazon
Copy link
Member

Adding @prudhvigodithi to take a look on this.

@TheAlgo
Copy link
Member

TheAlgo commented Apr 1, 2022

Apologies @bluehawk27 , this got completely missed. Could you resolve the conversations for the comments you have addressed? We can take care of the conflicts and chart bumps

@bluehawk27
Copy link
Contributor Author

@TheAlgo I resolved the convo's :) hope that helps move this forward. Cheers

@peterzhuamazon peterzhuamazon self-requested a review April 25, 2022 23:31
@peterzhuamazon
Copy link
Member

Hi @DandyDeveloper @TheAlgo @prudhvigodithi please review again, I will resolve the version conflicts once you guys are good.
Thanks.

@prudhvigodithi
Copy link
Member

LGTM!

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@bluehawk27 bluehawk27 requested a review from a team as a code owner July 7, 2022 23:52
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member

Hi @bluehawk27 I have rebased your branch on main and remove the opensearch changelogs as only dashboards get changed with lifecycle hooks.

@TheAlgo @DandyDeveloper @prudhvigodithi please review.

Thanks.

Signed-off-by: pgodithi <pgodithi@amazon.com>
Signed-off-by: pgodithi <pgodithi@amazon.com>
@prudhvigodithi
Copy link
Member

Hey @bluehawk27 I have done an upstream fetch and merge, to keep the versions in consistent with yesterday's release PR
#283, additionally I have fixed some lint error.

@prudhvigodithi
Copy link
Member

LGTM @DandyDeveloper and @TheAlgo please review.
Thank you

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.

LGTM!

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.

Can we add this option in the README as well before merging? @bluehawk27 Let me know if that sounds good. Thanks

@TheAlgo
Copy link
Member

TheAlgo commented Jul 19, 2022

Any update on this @bluehawk27 ?

@peterzhuamazon
Copy link
Member

I am going to add to readme and resolve conflict/backport @TheAlgo @prudhvigodithi

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon merged commit 8f08e77 into opensearch-project:main Aug 2, 2022
peterzhuamazon pushed a commit to peterzhuamazon/helm-charts that referenced this pull request Aug 2, 2022
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member

Backport 1.x: #305

Thanks @bluehawk27 for the contribution and sorry for the delay.

Thanks.

peterzhuamazon added a commit that referenced this pull request Aug 2, 2022
* Backport 1.x from #145

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

* Empty commit

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

Co-authored-by: Alberto Villacorta <avillacorta27@gmail.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-dashboards] Add lifecycle: block to values file
7 participants