Add roadmap, fix manifests, improve hack scripts

hack/cluster-monitoring/deploy

@@ -1,14 +1,23 @@
 #!/usr/bin/env bash
 
+set -o xtrace
+
 if [ -z "${KUBECONFIG}" ]; then
     KUBECONFIG=~/.kube/config
 fi
 
-if [ -z "${KUBE_NAMESPACE}" ]; then
-    KUBE_NAMESPACE=default
-fi  
+kubectl --kubeconfig="$KUBECONFIG" create namespace monitoring
 
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" create -f manifests/controllers/prometheus-controller.yaml
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" create -f manifests/exporters
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" create -f manifests/grafana
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" create -f manifests/prometheus
+kctl() {
+    kubectl --kubeconfig="$KUBECONFIG" -n "monitoring" "$@"
+}
+
+kctl apply -f manifests/controllers/prometheus-controller.yaml
+
+# Wait for TPRs to be ready.
+until kctl get servicemonitor; do sleep 0.1; done
+until kctl get prometheus; do sleep 0.1; done
+
+kctl apply -f manifests/exporters
+kctl apply -f manifests/grafana
+kctl apply -f manifests/prometheus

hack/cluster-monitoring/teardown

@@ -4,11 +4,15 @@ if [ -z "${KUBECONFIG}" ]; then
     KUBECONFIG=~/.kube/config
 fi
 
-if [ -z "${KUBE_NAMESPACE}" ]; then
-    KUBE_NAMESPACE=default
-fi  
+kctl() {
+    kubectl --kubeconfig="$KUBECONFIG" -n "monitoring" "$@"
+}
 
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" delete -f manifests/exporters
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" delete -f manifests/grafana
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" delete -f manifests/prometheus
-kubectl --kubeconfig="$KUBECONFIG" -n "$KUBE_NAMESPACE" delete -f manifests/controllers/prometheus-controller.yaml
+kctl delete -f manifests/exporters
+kctl delete -f manifests/grafana
+kctl delete -f manifests/prometheus
+
+# Hack: wait a bit to let the controller delete the deployed Prometheus server.
+sleep 5
+
+kctl delete -f manifests/controllers/prometheus-controller.yaml