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

[7.17] [CI] Fix issues related to publish (#183393) #183547

Merged
merged 1 commit into from
May 15, 2024
Merged

[7.17] [CI] Fix issues related to publish (#183393) #183547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions .buildkite/scripts/common/vault_fns.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,23 @@ vault_kv_set() {

vault kv put "$VAULT_KV_PREFIX/$kv_path" "${fields[@]}"
}

function get_vault_role_id() {
if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
else
VAULT_ROLE_ID="$(vault_get kibana-buildkite-vault-credentials role-id)"
fi

echo "$VAULT_ROLE_ID"
}

function get_vault_secret_id() {
if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
else
VAULT_SECRET_ID="$(vault_get kibana-buildkite-vault-credentials secret-id)"
fi

echo "$VAULT_SECRET_ID"
}
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/artifacts/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ docker pull docker.elastic.co/infra/release-manager:latest

echo "--- Publish artifacts"
if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
export VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
export VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
export VAULT_ROLE_ID="$(get_vault_role_id)"
export VAULT_SECRET_ID="$(get_vault_secret_id)"
export VAULT_ADDR="https://secrets.elastic.co:8200"
docker run --rm \
--name release-manager \
Expand Down