From 52cc81103c6df53cb3b9cfd27909123f0c1572be Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 28 Jul 2020 12:37:45 -0500
Subject: [PATCH] Fix namespace in geosphere-client test deployment
---
.gitlab-ci.yml | 5 ++++-
admin/README.md | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a7dfba..54ce5b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,6 +173,9 @@ deploy_prod_rabbit:
# install third-party rabbitmq server
- helm repo add bitnami "https://charts.bitnami.com/bitnami"
- helm upgrade -v 2 --install --kubeconfig $kubeconfig -f ci_geosphere-test/values-geosphere-rabbit.yaml $EXTRA_ARGS --namespace $ns geosphere-rabbit bitnami/rabbitmq
+ # do a little waiting for the rabbitmq pod to be ready so future stages
+ # don't fail to communicate with it
+ - kubectl wait -n geosphere-test pod/geosphere-rabbit-rabbitmq-0 --timeout 60s --for=condition=Ready
# this job doesn't actually need any artifacts from previous jobs
dependencies: []
rules:
@@ -294,7 +297,7 @@ deploy_client_test:
extends: .helm_based_job
stage: deploy Client
script:
- - ns="geosphere"
+ - ns="geosphere-test"
- cd geosphere-client/chart
- source geosphere-client/cibuild.env
# copy secret kubeconfig to the mounted (pwd) directory
diff --git a/admin/README.md b/admin/README.md
index 849ceca..8e0ccd4 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -93,7 +93,7 @@ To do this, run the following in bash on the cluster:
ak=$(kubectl get secret -n "$namespace" geosphere-minio -o jsonpath="{.data.accesskey}" | base64 -d)
sk=$(kubectl get secret -n "$namespace" geosphere-minio -o jsonpath="{.data.secretkey}" | base64 -d)
EXTRA_ARGS="--set accessKey=$ak --set secretKey=$sk"
-helm upgrade -v 2 --install -f production/values-geosphere-minio.yaml $EXTRA_ARGS -n $namespace geosphere-minio stable/minio
+helm upgrade -v 2 --install -f admin/values-geosphere-minio.yaml $EXTRA_ARGS -n $namespace geosphere-minio stable/minio
```
Note, `geosphere-minio` in the above commands must match the name of the release
--
GitLab