Updates Docker and windows distribution build files to reflect to changes in admin user setup #4274

DarshitChanpura · 2023-12-08T17:59:57Z

Description

As a follow-up of #4250, this PR updates docker and windows distribution install script to adapt to changes in demo configuration setup.

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.

… user setup Signed-off-by: Darshit Chanpura <[email protected]>

Signed-off-by: Darshit Chanpura <[email protected]>

codecov · 2023-12-08T18:05:47Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4b0b53d) 91.35% compared to head (4a34e4e) 91.35%.
Report is 12 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4274   +/-   ##
=======================================
  Coverage   91.35%   91.35%           
=======================================
  Files         190      190           
  Lines        6175     6175           
=======================================
  Hits         5641     5641           
  Misses        534      534

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura · 2023-12-14T21:48:27Z

@prudhvigodithi @rishabh6788 Mind reviewing this?

docker/release/config/opensearch/opensearch-docker-entrypoint.sh

scripts/opensearch-onetime-setup.sh

scripts/startup/zip/windows/opensearch-windows-install.bat

…onment variable Signed-off-by: Darshit Chanpura <[email protected]>

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura · 2024-01-04T14:40:26Z

docker/release/dockercomposefiles/docker-compose-2.x.yml

@@ -35,6 +36,7 @@ services:
      - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2
      - bootstrap.memory_lock=true
      - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD}


these changes the default docker-compose files for 2.x line to now include an additional env variable (to be passed by user) to set the admin password.

This will be accompanied by the change in download instructions on the project-website (file to change) to reflect the new requirement as an additional step.

We need to add a comment for this line, so that people knows it is only for 2.12.0 and up.
Also, the documentation and the download page needs to be tweaked with the same changes as well.

https://opensearch.org/docs/2.11/install-and-configure/install-opensearch/docker/
https://opensearch.org/downloads.html

Hey @DarshitChanpura please take a look at this.

I added it above, and following the convention, I didn't add it second time as no other settings that have comments on the first one have comments here.

@prudhvigodithi @peterzhuamazon ^^

I have updated the comment to mention that it is required for 2.12 and higher

DarshitChanpura · 2024-01-04T14:41:02Z

@peterzhuamazon @prudhvigodithi @rishabh6788 Can I please get more reviews?

DarshitChanpura · 2024-01-08T15:42:39Z

@peterzhuamazon @prudhvigodithi @rishabh6788 Could I please get reviews on this? We suspect this is currently causing integ tests to fail, and merging this will unblock them.

peterzhuamazon · 2024-01-08T22:04:20Z

Need to change these as well if you plan to change docker-compose:
https://opensearch.org/samples/docker-compose.yml
https://opensearch.org/docs/latest/install-and-configure/install-opensearch/docker/#sample-docker-composeyml

peterzhuamazon · 2024-01-08T22:04:28Z

Also need @prudhvigodithi to confirm on @DarshitChanpura comment above regarding keeping the exit 1 for docker and tar, but remove for deb and rpm.

DarshitChanpura · 2024-01-09T14:22:05Z

Need to change these as well if you plan to change docker-compose: https://opensearch.org/samples/docker-compose.yml https://opensearch.org/docs/latest/install-and-configure/install-opensearch/docker/#sample-docker-composeyml

Yes, I have PRs out to to address both:

Updates docker download steps to adapt to changes to admin password project-website#2526
Adds documentation for security demo configuration setup documentation-website#6058

DarshitChanpura · 2024-01-09T14:29:32Z

Also need @prudhvigodithi to confirm on @DarshitChanpura comment above regarding keeping the exit 1 for docker and tar, but remove for deb and rpm.

@peterzhuamazon RPM and DEB setup already has set -e and hence no need for || exit 1. There are no changes to RPM/DEB setup in this PR.

DarshitChanpura · 2024-01-11T16:42:33Z

@peterzhuamazon Could I get re-review on this PR?

prudhvigodithi · 2024-01-11T18:36:03Z

The same #4250 (comment) goes here as well.

prudhvigodithi · 2024-01-11T18:38:37Z

@DarshitChanpura can you please use as echo -e "This is a line with a new line.\nThis is the second line." to print statements in a new line. We dont need 3 echo lines.

This is a line with a new line.
This is the second line

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura · 2024-01-11T19:12:47Z

Similar to #4250 (comment), I've updated docker related scripts with printf. There is no echo -e or printf for windows from what I understand

DarshitChanpura · 2024-01-16T15:14:30Z

@peterzhuamazon @prudhvigodithi @rishabh6788 Could I get some more reviews?

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura · 2024-01-16T20:44:20Z

@peterzhuamazon Is there anything blocking this PR still?

DarshitChanpura · 2024-01-16T20:55:21Z

CI task seemed to have failed due to connectivity issues, and re-run should solve it.

Warning: Failed to download action 'https://api.github.com/repos/codecov/codecov-action/tarball/f32b3a3741e1053eb607407145bc9619351dc93b'. Error: Operation timed out (api.github.com:443)
Warning: Back off 21.499 seconds before retry.
Warning: Failed to download action 'https://api.github.com/repos/codecov/codecov-action/tarball/f32b3a3741e1053eb607407145bc9619[35](https://github.com/opensearch-project/opensearch-build/actions/runs/7546189581/job/20543417266?pr=4274#step:1:39)1dc93b'. Error: Operation timed out (api.github.com:443)
Warning: Back off 24.923 seconds before retry.
Error: nodename nor servname provided, or not known (api.github.com:443)

DarshitChanpura · 2024-01-18T14:46:07Z

@peterzhuamazon @rishabh6788 Could I get some more reviews?

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura · 2024-01-19T18:03:44Z

@peterzhuamazon Could I get your reviews on this? Also could you or a maintainer trigger re-run for Lint Checker as it timed out during the latest run.

DarshitChanpura added 2 commits December 8, 2023 12:55

Updates docker and windows distribution to reflect changes with admin…

278aa72

… user setup Signed-off-by: Darshit Chanpura <[email protected]>

Updates info log

1f7eb92

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura requested review from dblock, peterzhuamazon, bbarani, gaiksaya, rishabh6788, zelinh, jordarlu, prudhvigodithi, Divyaasm and tianleh as code owners December 8, 2023 17:59

github-actions bot added the valued-contributor label Dec 8, 2023

DarshitChanpura added 4 commits December 13, 2023 15:10

Updates the info message to reflect env variable name change

db0447f

Signed-off-by: Darshit Chanpura <[email protected]>

Merge remote-tracking branch 'upstream/main' into docker-win-update

c4653ef

Corrects info logs

5333171

Signed-off-by: Darshit Chanpura <[email protected]>

Captializes security plugin name in info logs

6813935

Signed-off-by: Darshit Chanpura <[email protected]>

peterzhuamazon requested changes Jan 2, 2024

View reviewed changes

docker/release/config/opensearch/opensearch-docker-entrypoint.sh Show resolved Hide resolved

scripts/opensearch-onetime-setup.sh Show resolved Hide resolved

scripts/startup/zip/windows/opensearch-windows-install.bat Show resolved Hide resolved

DarshitChanpura added 2 commits January 4, 2024 09:35

Updates sample docker compose files to accept admin password as envir…

e59d8fc

…onment variable Signed-off-by: Darshit Chanpura <[email protected]>

Fixes too few spaces error

44f6832

Signed-off-by: Darshit Chanpura <[email protected]>

DarshitChanpura commented Jan 4, 2024

View reviewed changes

This was referenced Jan 4, 2024

[Enhancement] Ensure graceful termination if weak/no initial admin password set opensearch-project/security#3915

Closed

[META] Update all instances of admin:admin across different repositories opensearch-project/security#3624

Closed

DarshitChanpura mentioned this pull request Jan 5, 2024

Updates docker download steps to adapt to changes to admin password opensearch-project/project-website#2526

Merged

1 task

derek-ho mentioned this pull request Jan 8, 2024

[AUTOCUT] Integration Test failed for security: 2.12.0 tar distribution opensearch-project/security#3876

Closed

DarshitChanpura mentioned this pull request Jan 9, 2024

Pass in strong password instead to fix integtest workflow #4302

Merged

DarshitChanpura added 2 commits January 11, 2024 13:50

Merge remote-tracking branch 'upstream/main' into docker-win-update

c504889

Updates multiple echos with a single printf

85ef16c

Signed-off-by: Darshit Chanpura <[email protected]>

reta mentioned this pull request Jan 15, 2024

[Backport] [2.x] Update to Gradle 8.5 (#1369) opensearch-project/alerting#1371

Merged

DarshitChanpura added the v2.12.0 label Jan 16, 2024

prudhvigodithi approved these changes Jan 16, 2024

View reviewed changes

Change to echo -e

583d580

Signed-off-by: Darshit Chanpura <[email protected]>

Updates comment in docker compose files

4a34e4e

Signed-off-by: Darshit Chanpura <[email protected]>

peterzhuamazon approved these changes Jan 19, 2024

View reviewed changes

peterzhuamazon merged commit 5f47981 into opensearch-project:main Jan 19, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates Docker and windows distribution build files to reflect to changes in admin user setup #4274

Updates Docker and windows distribution build files to reflect to changes in admin user setup #4274

DarshitChanpura commented Dec 8, 2023 •

edited

Loading

codecov bot commented Dec 8, 2023 •

edited

Loading

DarshitChanpura commented Dec 14, 2023

DarshitChanpura Jan 4, 2024

peterzhuamazon Jan 16, 2024

prudhvigodithi Jan 18, 2024

DarshitChanpura Jan 18, 2024

DarshitChanpura Jan 18, 2024

DarshitChanpura Jan 18, 2024

DarshitChanpura commented Jan 4, 2024

DarshitChanpura commented Jan 8, 2024 •

edited

Loading

peterzhuamazon commented Jan 8, 2024

peterzhuamazon commented Jan 8, 2024

DarshitChanpura commented Jan 9, 2024

DarshitChanpura commented Jan 9, 2024

DarshitChanpura commented Jan 11, 2024

prudhvigodithi commented Jan 11, 2024

prudhvigodithi commented Jan 11, 2024 •

edited

Loading

DarshitChanpura commented Jan 11, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 18, 2024 •

edited

Loading

DarshitChanpura commented Jan 19, 2024

Updates Docker and windows distribution build files to reflect to changes in admin user setup #4274

Updates Docker and windows distribution build files to reflect to changes in admin user setup #4274

Conversation

DarshitChanpura commented Dec 8, 2023 • edited Loading

Description

codecov bot commented Dec 8, 2023 • edited Loading

Codecov Report

DarshitChanpura commented Dec 14, 2023

DarshitChanpura Jan 4, 2024

Choose a reason for hiding this comment

peterzhuamazon Jan 16, 2024

Choose a reason for hiding this comment

prudhvigodithi Jan 18, 2024

Choose a reason for hiding this comment

DarshitChanpura Jan 18, 2024

Choose a reason for hiding this comment

DarshitChanpura Jan 18, 2024

Choose a reason for hiding this comment

DarshitChanpura Jan 18, 2024

Choose a reason for hiding this comment

DarshitChanpura commented Jan 4, 2024

DarshitChanpura commented Jan 8, 2024 • edited Loading

peterzhuamazon commented Jan 8, 2024

peterzhuamazon commented Jan 8, 2024

DarshitChanpura commented Jan 9, 2024

DarshitChanpura commented Jan 9, 2024

DarshitChanpura commented Jan 11, 2024

prudhvigodithi commented Jan 11, 2024

prudhvigodithi commented Jan 11, 2024 • edited Loading

DarshitChanpura commented Jan 11, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 16, 2024

DarshitChanpura commented Jan 18, 2024 • edited Loading

DarshitChanpura commented Jan 19, 2024

DarshitChanpura commented Dec 8, 2023 •

edited

Loading

codecov bot commented Dec 8, 2023 •

edited

Loading

DarshitChanpura commented Jan 8, 2024 •

edited

Loading

prudhvigodithi commented Jan 11, 2024 •

edited

Loading

DarshitChanpura commented Jan 18, 2024 •

edited

Loading