Skip to content

Commit

Permalink
Revert vault-related changes from #187762 (#187990)
Browse files Browse the repository at this point in the history
Only revert one bit of the problem. It's failing in the bazel-cache
builds:
https://buildkite.com/elastic/kibana-macos-bazel-cache/builds/37383
because the bazel-cache was never migrated to the new infra, so there
are different `vault` defaults.
  • Loading branch information
delanni authored Jul 10, 2024
1 parent ac91af8 commit 8fcf4b9
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions .buildkite/scripts/common/vault_fns.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
#!/bin/bash

# TODO: rewrite after https://github.com/elastic/kibana-operations/issues/15 is done
export LEGACY_VAULT_ADDR="https://secrets.elastic.co:8200"
export VAULT_PATH_PREFIX="secret/ci/elastic-kibana"
export VAULT_KV_PREFIX="kv/ci-shared/kibana-deployments"
export IS_LEGACY_VAULT_ADDR=false
if [[ "${VAULT_ADDR:-}" == "$LEGACY_VAULT_ADDR" ]]; then
VAULT_PATH_PREFIX="secret/kibana-issues/dev"
VAULT_KV_PREFIX="secret/kibana-issues/dev"
IS_LEGACY_VAULT_ADDR=true
else
VAULT_PATH_PREFIX="secret/ci/elastic-kibana"
VAULT_KV_PREFIX="kv/ci-shared/kibana-deployments"
IS_LEGACY_VAULT_ADDR=false
fi
export IS_LEGACY_VAULT_ADDR

retry() {
local retries=$1; shift
Expand Down

0 comments on commit 8fcf4b9

Please sign in to comment.