Properly separate 1.x/2.x/default opensearch docker entrypoint like in opensearch-dashboards #4452
Conversation
…n opensearch-dashboards Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
peterzhuamazon
added
bug
peterzhuamazon
requested review from
dblock,
bbarani,
gaiksaya,
rishabh6788,
zelinh,
jordarlu,
prudhvigodithi,
Divyaasm and
tianleh
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4452 +/- ##
=======================================
Coverage 91.55% 91.55%
=======================================
Files 190 190
Lines 6214 6214
=======================================
Hits 5689 5689
Misses 525 525 ☔ View full report in Codecov by Sentry. |
| ``` | ||
| Note: For OpenSearch > 2.11.1 and > 1.3.14, `DISABLE_SECURITY_PLUGIN` when set to true will automatically disable the security demo configuration setup and will no longer require `DISABLE_INSTALL_DEMO_CONFIG` to be explicitly set. | ||
| Note: For OpenSearch 2.12 and later, `DISABLE_SECURITY_PLUGIN` when set to true will automatically disable the security demo configuration setup and will no longer require `DISABLE_INSTALL_DEMO_CONFIG` to be explicitly set. |
There was a problem hiding this comment.
qq, what happens for release 1.3.15 and 2.11.2?
There was a problem hiding this comment.
- There is no 2.11.2 if 2.12 is released.
- 1.3.15 use the same entrypoint as 1.3.14 since 1.x/2.x/default.x are separate now.
- 1.x entrypoint exactly the same as 1.3.14 while 2.x and default are the same following the latest one.
| SECURITY_PLUGIN="opensearch-security" | ||
|
|
||
| if [ -d "$OPENSEARCH_HOME/plugins/$SECURITY_PLUGIN" ]; then | ||
| if [ "$DISABLE_INSTALL_DEMO_CONFIG" = "true" ]; then |
There was a problem hiding this comment.
why not keep it same as 2.x? If I understand correctly this is the only difference i see between this file and one for 2.x
There was a problem hiding this comment.
The point to do the separation is to keep 1.x behavior while only change 2.x since admin:admin only touch 2.x. I am not saying the original implementation is the best, but I try to keep 1.x as it is, not getting affected.
|
the changes look good to me based on the responses from the comments. One final question I have is will this be test-able only after RC generation? |
I test the build on local for both 1 and 2 and they both goes up. |
|
Adding @bbarani @prudhvigodithi for review here. |
Description
Properly separate 1.x/2.x/default opensearch docker entrypoint like in opensearch-dashboards
Issues Resolved
#4445
#4115
A follow up to #4446 and #4450.
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.