From a779106ce4b10279258513c162129430bd70a8f3 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 20 Aug 2020 13:59:52 -0500
Subject: [PATCH] Try using a less specific helm docker mount
---
ci_gcp/gitlab-ci.yaml | 3 ++-
helpers/shell_aliases.sh | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ci_gcp/gitlab-ci.yaml b/ci_gcp/gitlab-ci.yaml
index 03e6434..a4112a2 100644
--- a/ci_gcp/gitlab-ci.yaml
+++ b/ci_gcp/gitlab-ci.yaml
@@ -53,11 +53,12 @@ gstest deploy client:
- cp ../../ci_gcp/values-client.yaml .
- echo $(pwd)
- echo ~
+ - echo $HOME
- ls ~/.kube || echo "Nope"
- ls ~/.config || echo "Nope"
- helm list
# namespace names are the same as domain names
- - helm upgrade -v 2 --install --namespace $ns -f values-client.yaml geosphere-client geosphere-client/
+ - helm_for_gcp upgrade -v 2 --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 082d11f..e3d29f1 100644
--- a/helpers/shell_aliases.sh
+++ b/helpers/shell_aliases.sh
@@ -7,6 +7,11 @@ 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 "$@"
+}
+export -f helm_for_gcp
+
kubectl() {
docker run -a stdout --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl "$@"
}
--
GitLab