Fix observability deployment

Signed-off-by: ArthurSens <arthursens2005@gmail.com>
gitpod-io · Mar 31, 2022 · c649382 · c649382
1 parent eb173bd
commit c649382
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.werft/jobs/build/deploy-to-preview-environment.ts b/.werft/jobs/build/deploy-to-preview-environment.ts
@@ -703,7 +703,6 @@ async function installMonitoring(kubeconfig: string, namespace: string, nodeExpo
     const installMonitoringSatelliteParams = new InstallMonitoringSatelliteParams();
     installMonitoringSatelliteParams.kubeconfigPath = kubeconfig
     installMonitoringSatelliteParams.branch = observabilityBranch;
-    installMonitoringSatelliteParams.kubeconfigPath = ""
     installMonitoringSatelliteParams.satelliteNamespace = namespace
     installMonitoringSatelliteParams.clusterName = namespace
     installMonitoringSatelliteParams.nodeExporterPort = nodeExporterPort

diff --git a/.werft/observability/monitoring-satellite.ts b/.werft/observability/monitoring-satellite.ts
@@ -83,7 +83,7 @@ async function ensureCorrectInstallationOrder(kubeconfig: string, namespace: str
     const werft = getGlobalWerftInstance()
 
     werft.log(sliceName, 'installing monitoring-satellite')
-    exec(`cd observability && KUBECONFIG=${kubeconfig} hack/deploy-satellite.sh`, {slice: sliceName})
+    exec(`cd observability && hack/deploy-satellite.sh --kubeconfig ${kubeconfig}`, {slice: sliceName})
 
     deployGitpodServiceMonitors(kubeconfig)
     checkReadiness(kubeconfig, namespace, checkNodeExporterStatus)
@@ -92,7 +92,7 @@ async function ensureCorrectInstallationOrder(kubeconfig: string, namespace: str
 async function checkReadiness(kubeconfig: string, namespace: string, checkNodeExporterStatus: boolean) {
     // For some reason prometheus' statefulset always take quite some time to get created
     // Therefore we wait a couple of seconds
-    exec(`sleep 30 && kubectl rollout status -n ${namespace} statefulset prometheus-k8s`, {slice: sliceName, async: true})
+    exec(`sleep 30 && kubectl --kubeconfig ${kubeconfig} rollout status -n ${namespace} statefulset prometheus-k8s`, {slice: sliceName, async: true})
     exec(`kubectl --kubeconfig ${kubeconfig} rollout status -n ${namespace} deployment grafana`, {slice: sliceName, async: true})
     exec(`kubectl --kubeconfig ${kubeconfig} rollout status -n ${namespace} deployment kube-state-metrics`, {slice: sliceName, async: true})
     exec(`kubectl --kubeconfig ${kubeconfig} rollout status -n ${namespace} deployment otel-collector`, {slice: sliceName, async: true})