diff --git a/ci_gcp/gitlab-ci.yaml b/ci_gcp/gitlab-ci.yaml index a4112a2c885ab6caa1ffcea9cf42c4c978010f14..4127322a0d081940061114eef00df7ce05eb50ff 100644 --- a/ci_gcp/gitlab-ci.yaml +++ b/ci_gcp/gitlab-ci.yaml @@ -56,9 +56,9 @@ gstest deploy client: - echo $HOME - ls ~/.kube || echo "Nope" - ls ~/.config || echo "Nope" - - helm list + - helm list --kubeconfig /root/.kube/config # namespace names are the same as domain names - - helm_for_gcp upgrade -v 2 --install --namespace $ns -f values-client.yaml geosphere-client geosphere-client/ + - helm_for_gcp upgrade -v 2 --kubeconfig /root/.kube/config --install --namespace $ns -f values-client.yaml geosphere-client geosphere-client/ dependencies: - get_chart_client_test rules: diff --git a/helpers/shell_aliases.sh b/helpers/shell_aliases.sh index e3d29f1e8eb3e0020239e05dc9ee062707b59afd..f5ce375f5c9d0b2302b9dd12bfd6afcf12360ef9 100644 --- a/helpers/shell_aliases.sh +++ b/helpers/shell_aliases.sh @@ -8,7 +8,7 @@ helm() { export -f helm helm_for_gcp() { - 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:/root/.config -v ~/.cache:/root/.cache alpine/helm:3.2.3 "$@" + docker run -t --rm -e HELM_EXPERIMENTAL_OCI="$HELM_EXPERIMENTAL_OCI" -e KUBECONFIG="/root/.kube/config" -v $(pwd):/apps -w /apps -v ~/.kube:/root/.kube -v ~/.helm:/root/.helm -v ~/.config:/root/.config -v ~/.cache:/root/.cache alpine/helm:3.2.3 "$@" } export -f helm_for_gcp