From d802f0ad90de686bce153243dcc88c1c4f9076f5 Mon Sep 17 00:00:00 2001
From: Isala Piyarisi <code@isala.me>
Date: Wed, 16 Mar 2022 03:26:00 +0530
Subject: [PATCH] fix(control-plane): Fixed a bug in servings config generation

---
 .../samples/lazykoala_v1alpha1_inspector.yaml | 20 +++++++++++--------
 .../controllers/inspector_controller.go       |  5 +++--
 gazer/deployment.yaml                         | 13 ++++++++++++
 sherlock/deployment.yaml                      | 12 +++++------
 sherlock/src/inference.rs                     |  2 +-
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml b/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
index 3c537a1..14dde33 100644
--- a/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
+++ b/control-plane/config/samples/lazykoala_v1alpha1_inspector.yaml
@@ -4,8 +4,9 @@ metadata:
   name: service-1
   namespace: default
 spec:
-  deploymentRef: service-1-05588114
-  serviceRef: service-1-05588114
+  deploymentRef: service-1-62bf5632
+  serviceRef: service-1-62bf5632
+  modelName: service-1-62bf5632
   namespace: default
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
@@ -14,8 +15,9 @@ metadata:
   name: service-2
   namespace: default
 spec:
-  deploymentRef: service-2-05588114
-  serviceRef: service-2-05588114
+  deploymentRef: service-2-62bf5632
+  serviceRef: service-2-62bf5632
+  modelName: service-1-62bf5632
   namespace: default
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
@@ -24,8 +26,9 @@ metadata:
   name: service-3
   namespace: default
 spec:
-  deploymentRef: service-3-05588114
-  serviceRef: service-3-05588114
+  deploymentRef: service-3-62bf5632
+  serviceRef: service-3-62bf5632
+  modelName: service-1-62bf5632
   namespace: default
 ---
 apiVersion: lazykoala.isala.me/v1alpha1
@@ -34,8 +37,9 @@ metadata:
   name: service-4
   namespace: default
 spec:
-  deploymentRef: service-4-05588114
-  serviceRef: service-4-05588114
+  deploymentRef: service-4-62bf5632
+  serviceRef: service-4-62bf5632
+  modelName: service-1-62bf5632
   namespace: default
 ---
 
diff --git a/control-plane/controllers/inspector_controller.go b/control-plane/controllers/inspector_controller.go
index 1e7514f..88757c8 100644
--- a/control-plane/controllers/inspector_controller.go
+++ b/control-plane/controllers/inspector_controller.go
@@ -20,11 +20,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"gopkg.in/yaml.v3"
 	appsv1 "k8s.io/api/apps/v1"
 	"text/template"
 	"time"
 
-	"gopkg.in/yaml.v3"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -301,10 +301,11 @@ func (r *InspectorReconciler) configureSherlock(ctx context.Context, inspector *
 			ModelName: inspector.Spec.ModelName,
 			Namespace: inspector.Spec.Namespace,
 		}
+		modelsList[inspector.Spec.ModelName] = true
 	} else {
 		if _, ok := sherlockServiceList[inspector.Spec.DeploymentRef]; ok {
 			delete(sherlockServiceList, inspector.Spec.DeploymentRef)
-			delete(modelsList, inspector.Spec.DeploymentRef)
+			delete(modelsList, inspector.Spec.ModelName)
 		}
 	}
 
diff --git a/gazer/deployment.yaml b/gazer/deployment.yaml
index 448d849..5aa3eda 100644
--- a/gazer/deployment.yaml
+++ b/gazer/deployment.yaml
@@ -191,6 +191,19 @@ spec:
     requests:
       storage: 8Gi
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus
+  namespace: lazy-koala
+spec:
+  selector:
+    app: prometheus
+  ports:
+    - protocol: TCP
+      port: 9090
+      targetPort: 9090
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/sherlock/deployment.yaml b/sherlock/deployment.yaml
index c8bc18d..ed27c21 100644
--- a/sherlock/deployment.yaml
+++ b/sherlock/deployment.yaml
@@ -17,15 +17,18 @@ spec:
       serviceAccountName: gke-workload-identity
       containers:
         - name: sherlock
+          imagePullPolicy: Always
           image: ghcr.io/mrsupiri/lazy-koala/sherlock:latest
           ports:
             - containerPort: 9898
               name: metrics
           env:
-            - name: END_POINT
-              value: "http://localhost:8501/v1/models/sherlock:predict"
+            - name: TENSORFLOW_END_POINT
+              value: "http://localhost:8501/v1/models"
             - name: POOL_DURATION
-              value: "1"
+              value: "60"
+            - name: PROMETHEUS_END_POINT
+              value: "http://prometheus.lazy-koala.svc.cluster.local"
           volumeMounts:
             - name: sherlock-config
               mountPath: /app/config
@@ -55,9 +58,6 @@ spec:
           ports:
             - containerPort: 8501
               name: http
-          env:
-            - name: MODEL_NAME
-              value: "sherlock"
           volumeMounts:
             - name: sherlock-config
               mountPath: /config
diff --git a/sherlock/src/inference.rs b/sherlock/src/inference.rs
index 5e20d05..9dec127 100644
--- a/sherlock/src/inference.rs
+++ b/sherlock/src/inference.rs
@@ -63,7 +63,7 @@ async fn query_model(service: &str, input: [[[f64; 1]; 9]; 10]) -> Result<f64, B
 }
 
 async fn calculate_anomaly_score(service: &str, args: &InferenceData) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Querying {} model", service);
+    println!("Calculate anomaly score for {} using {}", service, &args.model_name);
     let input = build_telemetry_matrix(&service).await?;
     let score = query_model(&args.model_name, input).await?;
     ANOMLAY_GAUGE.with_label_values(&[service, &args.namespace]).set(score);