From 7708f8eb83aa6ab31449b0b2e57133570e60c45f Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Mon, 28 Aug 2017 09:37:24 +0200
Subject: [PATCH] kube-prometheus: adapt deploy script to wait for CRDs
---
hack/cluster-monitoring/deploy | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index 9176b956..d959029d 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -17,10 +17,13 @@ kctl() {
kctl apply -f manifests/prometheus-operator
# Wait for TPRs to be ready.
-printf "Waiting for Operator to register third party objects..."
-until kctl get servicemonitor > /dev/null 2>&1; do sleep 1; printf "."; done
-until kctl get prometheus > /dev/null 2>&1; do sleep 1; printf "."; done
-until kctl get alertmanager > /dev/null 2>&1; do sleep 1; printf "."; done
+printf "Waiting for Operator to register custom resource definitions..."
+until kctl get customresourcedefinitions servicemonitors.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
+until kctl get customresourcedefinitions prometheuses.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
+until kctl get customresourcedefinitions alertmanagers.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
+until kctl get servicemonitors.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
+until kctl get prometheuses.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
+until kctl get alertmanagers.monitoring.coreos.com > /dev/null 2>&1; do sleep 1; printf "."; done
echo "done!"
kctl apply -f manifests/node-exporter
--
GitLab