fix up

Signed-off-by: Sam Yuan <[email protected]>

Author: SamYuan1990

lib/prometheus.sh

@@ -44,8 +44,7 @@ deploy_prometheus_operator() {
 		mv kube-prometheus/manifests/prometheus-prometheus.yaml.tmp \
 			kube-prometheus/manifests/prometheus-prometheus.yaml
 
-		#_setup_dashboard
-		#_run_yq
+		_setup_dashboard
 		_load_prometheus_operator_images_to_local_registry
 		kubectl create -f kube-prometheus/manifests/setup
 		kubectl wait \
@@ -137,11 +136,3 @@ metadata:
 EOF
     fi
 }
-
-_run_yq(){
-	f="$DASHBOARD_DIR/grafana-dashboards/kepler-exporter-configmap.yaml" \
-	yq -i e '.items += [load(env(f))]' "$KUBE_PROM_DIR"/manifests/grafana-dashboardDefinitions.yaml;
-	yq -i e '.spec.template.spec.containers.0.volumeMounts += [ {"mountPath": "/grafana-dashboard-definitions/0/kepler-exporter", "name": "grafana-dashboard-kepler-exporter", "readOnly": false} ]' "$KUBE_PROM_DIR"/manifests/grafana-deployment.yaml
-	yq -i e '.spec.template.spec.volumes += [ {"configMap": {"name": "grafana-dashboard-kepler-exporter"}, "name": "grafana-dashboard-kepler-exporter"} ]' "$KUBE_PROM_DIR"/manifests/grafana-deployment.yaml;
-	ok "Dashboard setup complete"
-}

verify.sh

@@ -21,6 +21,8 @@ set -eu -o pipefail
 PROJECT_ROOT="$(git rev-parse --show-toplevel)"
 declare -r PROJECT_ROOT
 declare -r KUBECONFIG_ROOT_DIR=${KUBECONFIG_ROOT_DIR:-$PROJECT_ROOT/.kube}
+declare -r KUBE_PROM_DIR="$PROJECT_ROOT/tmp/kube-prometheus"
+declare -r DASHBOARD_DIR="$KUBE_PROM_DIR/grafana-dashboards"
 # shellcheck source=lib/utils.sh
 source "$PROJECT_ROOT/lib/utils.sh"
 
@@ -68,6 +70,7 @@ verify_cluster() {
 	[[ $(kubectl get pods --all-namespaces | wc -l) == 0 ]] &&
 		die "it seems k8s cluster is not started"
 
+	run_yq
 	ok "Cluster is up and running"
 }
 
@@ -77,6 +80,15 @@ containerruntime() {
 	docker info || true
 }
 
+
+run_yq(){
+	f="$DASHBOARD_DIR/grafana-dashboards/kepler-exporter-configmap.yaml" \
+	yq -i e '.items += [load(env(f))]' "$KUBE_PROM_DIR"/manifests/grafana-dashboardDefinitions.yaml;
+	yq -i e '.spec.template.spec.containers.0.volumeMounts += [ {"mountPath": "/grafana-dashboard-definitions/0/kepler-exporter", "name": "grafana-dashboard-kepler-exporter", "readOnly": false} ]' "$KUBE_PROM_DIR"/manifests/grafana-deployment.yaml
+	yq -i e '.spec.template.spec.volumes += [ {"configMap": {"name": "grafana-dashboard-kepler-exporter"}, "name": "grafana-dashboard-kepler-exporter"} ]' "$KUBE_PROM_DIR"/manifests/grafana-deployment.yaml;
+	ok "Dashboard setup complete"
+}
+
 main() {
 	# verify the deployment of cluster
 	case $1 in