Skip to content

Commit

Permalink
ZO-5240: Remove vault remnants, storage-api requires no authentication
Browse files Browse the repository at this point in the history
  • Loading branch information
wosc committed Apr 26, 2024
1 parent d59af4d commit 8708413
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/nightwatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ jobs:
--override-type=json --overrides='[
{"op": "add", "path": "/spec/serviceAccount", "value": "baseproject"},
{"op": "add", "path": "/spec/containers/0/env", "value": [
{"name": "HTTPS_PROXY", "value": "http://static-ip-proxy.ops.zeit.de:3128"},
{"name": "VIVI_XMLRPC_PASSWORD", "valueFrom": {"secretKeyRef": {
"name": "principals",
"key": "vivi_zeit.cms.principals_system.nightwatch"
}}}
{"name": "HTTPS_PROXY", "value": "http://static-ip-proxy.ops.zeit.de:3128"}
]}
]'
Expand Down
14 changes: 0 additions & 14 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

function vault_read() {
local path=$1
local field=$2

if [[ -z "$VAULT_TOKEN" ]]; then
VAULT_TOKEN=$(<"$HOME/.vault-token")
fi
curl --silent -H "X-Vault-Token: $VAULT_TOKEN" \
"${VAULT_ADDR%/}/v1/zon/v1/${path}" | \
sed -e "s+^.*\"${field}\":\"\([^\"]*\).*$+\1+"
}


COMMAND=$1
case $COMMAND in
smoke)
Expand All @@ -33,7 +20,6 @@ case $COMMAND in
< k8s/base/kustomization.yaml)
docker buildx build --output type=docker --quiet --tag $image .
docker run --rm -it \
-e VIVI_XMLRPC_PASSWORD=$(vault_read vivi/$environment/nightwatch password) \
$image \
--nightwatch-environment=$environment "$@"
;;
Expand Down

0 comments on commit 8708413

Please sign in to comment.