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.

Sign up for GitHub

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

Avoid dialog in terminal during s3 key creation #936

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Avoid dialog in terminal during s3 key creation #936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b911d9
Fix s3 key creation
markbaumgarten Jan 9, 2025
050a6b3
Also check for existing keystore file in bootstrap pod
markbaumgarten Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions opensearch-operator/pkg/builders/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,13 @@ func NewSTSForNodePool(
#!/usr/bin/env bash
set -euo pipefail

/usr/share/opensearch/bin/opensearch-keystore create
if [ ! -f /usr/share/opensearch/config/opensearch.keystore ]; then
/usr/share/opensearch/bin/opensearch-keystore create
fi
for i in /tmp/keystoreSecrets/*/*; do
key=$(basename $i)
echo "Adding file $i to keystore key $key"
/usr/share/opensearch/bin/opensearch-keystore add-file "$key" "$i"
/usr/share/opensearch/bin/opensearch-keystore add-file "$key" "$i" --force
done

# Add the bootstrap password since otherwise the opensearch entrypoint tries to do this on startup
Expand Down Expand Up @@ -935,11 +937,13 @@ func NewBootstrapPod(
#!/usr/bin/env bash
set -euo pipefail

/usr/share/opensearch/bin/opensearch-keystore create
if [ ! -f /usr/share/opensearch/config/opensearch.keystore ]; then
/usr/share/opensearch/bin/opensearch-keystore create
fi
for i in /tmp/keystoreSecrets/*/*; do
markbaumgarten marked this conversation as resolved.
Show resolved Hide resolved
key=$(basename $i)
echo "Adding file $i to keystore key $key"
/usr/share/opensearch/bin/opensearch-keystore add-file "$key" "$i"
/usr/share/opensearch/bin/opensearch-keystore add-file "$key" "$i" --force
done

# Add the bootstrap password since otherwise the opensearch entrypoint tries to do this on startup
Expand Down
Loading