From ec5846b75122a74d1359bc857fe95afe0e805714 Mon Sep 17 00:00:00 2001
From: Sunyanan Choochotkaew <sunyanan.choochotkaew1@ibm.com>
Date: Thu, 9 Nov 2023 10:19:03 +0900
Subject: [PATCH] change instruction to deploy servicemonitor in
 multi-nic-cni-operator namespace

Signed-off-by: Sunyanan Choochotkaew <sunyanan.choochotkaew1@ibm.com>
---
 health-check/README.md         | 15 +++++++++++----
 health-check/checker/rbac.yaml |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/health-check/README.md b/health-check/README.md
index 6fdcef36..004894ad 100644
--- a/health-check/README.md
+++ b/health-check/README.md
@@ -16,7 +16,14 @@ kubectl create ns multi-nic-cni-operator
     cd multi-nic-cni/health-check
     chmod +x ./checker/script.sh
     ```
-3. Run 
+
+3. Add `openshift.io/cluster-monitoring` label to multi-nic-cni-operator namespace
+
+    ```bash
+    kubectl label ns multi-nic-cni-operator openshift.io/cluster-monitoring=true
+    ```
+
+4. Run 
 
     ```bash
     make deploy
@@ -40,7 +47,7 @@ kubectl create ns multi-nic-cni-operator
     deployment.apps/multi-nic-cni-health-checker created
     ```
 
-4. Check whether the health-checker and health-check-agent are running.
+5. Check whether the health-checker and health-check-agent are running.
 
     ```bash
     kubectl get po -n multi-nic-cni-operator
@@ -53,7 +60,7 @@ kubectl create ns multi-nic-cni-operator
     multi-nic-cni-health-checker-zz                              1/1     Running   0          
     ```
 
-5. Test status service with port forward
+6. Test status service with port forward
 
     ```bash
     # forward port on one terminal
@@ -79,7 +86,7 @@ kubectl create ns multi-nic-cni-operator
         > {"Info":{"HostName":"hostD","Connectivity":{"192.168.0.0/18":false,"192.168.64.0/18":false},"Allocability":0,"StatusCode":...,"Status":...,"Message":...},"CheckTime":"...","Checker":"checkerX"}
         ```
 
-6. Reload prometheus configuration
+7. Reload prometheus configuration
 
     For OpenShift cluster with prometheus operator deployed in openshift-monitoring,
 
diff --git a/health-check/checker/rbac.yaml b/health-check/checker/rbac.yaml
index 8b16c246..4c7b4a9a 100644
--- a/health-check/checker/rbac.yaml
+++ b/health-check/checker/rbac.yaml
@@ -67,7 +67,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: multi-nic-cni-health-check
-  namespace: openshift-monitoring
+  namespace: multi-nic-cni-operator
 spec:
   endpoints:
   - interval: 10s
@@ -160,7 +160,7 @@ metadata:
     multi-nic-cni-component: health-checker
     app: multi-nic-cni
   name: multi-nic-cni-health-checker-rules
-  namespace: openshift-monitoring
+  namespace: multi-nic-cni-operator
 spec:
   groups:
   - name: MultiNICFailure