From fa5fd97ee97dcfb50b3451de83411aa0a0e98263 Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Tue, 30 Jan 2018 11:51:26 +0000
Subject: [PATCH] wait for couch to come up
---
provisioning/couchdb-statefulset.yaml | 2 ++
templates/xpub-collabra-configmap-initscripts.yaml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/provisioning/couchdb-statefulset.yaml b/provisioning/couchdb-statefulset.yaml
index ba7051f..85179f0 100644
--- a/provisioning/couchdb-statefulset.yaml
+++ b/provisioning/couchdb-statefulset.yaml
@@ -11,10 +11,12 @@ spec:
serviceName: couchdb-internal-${CI_ENVIRONMENT_SLUG}
selector:
matchLabels:
+ env: ${CI_ENVIRONMENT_SLUG}
app: couchdb-${CI_ENVIRONMENT_SLUG}
template:
metadata:
labels:
+ env: ${CI_ENVIRONMENT_SLUG}
app: couchdb-${CI_ENVIRONMENT_SLUG}
spec:
containers:
diff --git a/templates/xpub-collabra-configmap-initscripts.yaml b/templates/xpub-collabra-configmap-initscripts.yaml
index f0c8b4e..779d210 100644
--- a/templates/xpub-collabra-configmap-initscripts.yaml
+++ b/templates/xpub-collabra-configmap-initscripts.yaml
@@ -9,6 +9,8 @@ data:
createdb.sh: | # NB envsubst cannot escape env vars
# initialise couch if it is the first deployment
+ echo 'Attempting to connect to couchdb'
+ until curl -m 15 http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984; do echo "Retrying"; done
curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_users
curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_replicator
--
GitLab