Skip to content
Snippets Groups Projects
Verified Commit f00e728c authored by David Hoese's avatar David Hoese
Browse files

Fix (hopefully) only provide stdout from kubectl commands

parent 98cc7cec
No related branches found
No related tags found
No related merge requests found
...@@ -109,7 +109,7 @@ deploy_prod_rabbit: ...@@ -109,7 +109,7 @@ deploy_prod_rabbit:
- kubeconfig=$(basename $kubekorner_k3s_config) - kubeconfig=$(basename $kubekorner_k3s_config)
# get password from any previous installation # get password from any previous installation
# if we don't do this the password will get out of sync # if we don't do this the password will get out of sync
- sec_info=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq 2>/dev/null || echo "") - sec_info=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq || echo "")
- echo $sec_info - echo $sec_info
- auth_sec="geosphere-rabbit-rabbitmq" - auth_sec="geosphere-rabbit-rabbitmq"
- if [ "$sec_info" != "" ]; then EXTRA_ARGS="--set auth.existingPasswordSecret=$auth_sec --set auth.existingErlangSecret=$auth_sec"; fi - if [ "$sec_info" != "" ]; then EXTRA_ARGS="--set auth.existingPasswordSecret=$auth_sec --set auth.existingErlangSecret=$auth_sec"; fi
......
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
- shopt -s expand_aliases - shopt -s expand_aliases
- alias helm='docker run -t --rm -e HELM_EXPERIMENTAL_OCI="$HELM_EXPERIMENTAL_OCI" -v $(pwd):/apps -w /apps -v ~/.kube:/root/.kube -v ~/.helm:/root/.helm -v ~/.config/helm:/root/.config/helm -v ~/.cache/helm:/root/.cache/helm alpine/helm:3.2.3' - alias helm='docker run -t --rm -e HELM_EXPERIMENTAL_OCI="$HELM_EXPERIMENTAL_OCI" -v $(pwd):/apps -w /apps -v ~/.kube:/root/.kube -v ~/.helm:/root/.helm -v ~/.config/helm:/root/.config/helm -v ~/.cache/helm:/root/.cache/helm alpine/helm:3.2.3'
- helm registry login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY} - helm registry login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
- alias kubectl='docker run -t --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl' - alias kubectl='docker run -a stdout --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment