From bd9371cfd632efad6c64b46d7a6b5dbdb14892e5 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 20 Aug 2020 14:22:26 -0500
Subject: [PATCH] More attempts at getting helm and gcp to play nice
---
ci_gcp/gitlab-ci.yaml | 4 ++--
helpers/shell_aliases.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci_gcp/gitlab-ci.yaml b/ci_gcp/gitlab-ci.yaml
index a4112a2..4127322 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 e3d29f1..f5ce375 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
--
GitLab