changed deployments map key to be va.Namespace/va.scaleTargetRef.name

Author: WheelyMcBones

internal/collector/replica_metrics.go

@@ -66,7 +66,7 @@ func NewReplicaMetricsCollector(metricsSource source.MetricsSource, k8sClient cl
 //   - ctx: Context for the operation
 //   - modelID: The model identifier to collect metrics for
 //   - namespace: The namespace where the model is deployed
-//   - deployments: Map of VariantAutoscaling namespace/name to Deployment
+//   - deployments: Map of Deployment namespace/name to Deployment
 //   - variantAutoscalings: Map of VariantAutoscaling namespace/name to VariantAutoscaling object
 //   - variantCosts: Map of VariantAutoscaling namespace/name to cost value
 //

internal/collector/source/pod_va_mapper.go

@@ -68,7 +68,7 @@ func (m *PodVAMapper) findDeploymentForPod(
 
 	pod := &corev1.Pod{}
 	if err := m.k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: podName}, pod); err != nil {
-		logger.Error(err, "failed to get pod", "pod", podName, "namespace", namespace)
+		logger.V(logging.DEBUG).Error(err, "failed to get pod", "pod", podName, "namespace", namespace)
 		return ""
 	}
 
@@ -80,7 +80,7 @@ func (m *PodVAMapper) findDeploymentForPod(
 
 	rs := &appsv1.ReplicaSet{}
 	if err := m.k8sClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: owner.Name}, rs); err != nil {
-		logger.Error(err, "failed to get ReplicaSet", "replicaset", owner.Name, "namespace", namespace)
+		logger.V(logging.DEBUG).Error(err, "failed to get ReplicaSet", "replicaset", owner.Name, "namespace", namespace)
 		return ""
 	}
 
@@ -91,10 +91,9 @@ func (m *PodVAMapper) findDeploymentForPod(
 	}
 
 	// Verify the Deployment is in our map of tracked Deployments
-	for _, deploy := range deployments {
-		if deploy != nil && deploy.Name == rsOwner.Name && deploy.Namespace == namespace {
-			return rsOwner.Name
-		}
+	deploymentKey := namespace + "/" + rsOwner.Name
+	if deploy, ok := deployments[deploymentKey]; ok && deploy != nil && deploy.Namespace == namespace {
+		return rsOwner.Name
 	}
 	return ""
 }

internal/collector/source/pod_va_mapper_test.go

@@ -116,7 +116,7 @@ var _ = Describe("PodVAMapper", func() {
 					},
 				},
 			}
-			deployments["default/llama-va"] = deployment
+			deployments["default/llama-deploy"] = deployment
 
 			va := createVA("llama-va", "default", "llama-deploy")
 			rs := createReplicaSet("llama-deploy-abc123", "default", "llama-deploy")
@@ -153,7 +153,7 @@ var _ = Describe("PodVAMapper", func() {
 					},
 				},
 			}
-			deployments["default/orphan-va"] = deployment
+			deployments["default/orphan-deploy"] = deployment
 
 			rs := createReplicaSet("orphan-deploy-abc123", "default", "orphan-deploy")
 			pod := createPod("orphan-deploy-abc123-xyz", "default", "orphan-deploy-abc123", map[string]string{"app": "orphan"})
@@ -180,7 +180,7 @@ var _ = Describe("PodVAMapper", func() {
 					},
 				},
 			}
-			deployments["default/llama-va"] = deployment
+			deployments["default/llama-deploy"] = deployment
 
 			// VA in different namespace should not match
 			va := createVA("llama-va", "production", "llama-deploy")
@@ -201,8 +201,7 @@ var _ = Describe("PodVAMapper", func() {
 			// Setup multiple deployments
 			var objects []client.Object
 			for _, name := range []string{"deploy-a", "deploy-b", "deploy-c"} {
-				vaName := "va-" + name[len("deploy-"):]
-				deployments["default/"+vaName] = &appsv1.Deployment{
+				deployments["default/"+name] = &appsv1.Deployment{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      name,
 						Namespace: "default",
@@ -247,7 +246,7 @@ var _ = Describe("PodVAMapper", func() {
 					},
 				},
 			}
-			deployments["default/cached-va"] = deployment
+			deployments["default/cached-deploy"] = deployment
 
 			va := createVA("cached-va", "default", "cached-deploy")
 			rs := createReplicaSet("cached-deploy-rs", "default", "cached-deploy")
@@ -281,7 +280,7 @@ var _ = Describe("PodVAMapper", func() {
 					},
 				},
 			}
-			deployments["default/removable-va"] = deployment
+			deployments["default/removable-deploy"] = deployment
 
 			va := createVA("removable-va", "default", "removable-deploy")
 			rs := createReplicaSet("removable-deploy-rs", "default", "removable-deploy")
@@ -297,7 +296,7 @@ var _ = Describe("PodVAMapper", func() {
 			Expect(result1).To(Equal("removable-va"))
 
 			// Remove deployment from map
-			delete(deployments, "default/removable-va")
+			delete(deployments, "default/removable-deploy")
 
 			// Second lookup - should return empty since deployment is gone from tracked map
 			result2 := mapper.FindVAForPod(ctx, "removable-deploy-pod-xyz", "default", deployments)
@@ -311,7 +310,7 @@ var _ = Describe("PodVAMapper", func() {
 					Namespace: "default",
 				},
 			}
-			deployments["default/standalone-va"] = deployment
+			deployments["default/standalone-deploy"] = deployment
 
 			// Pod without owner references (standalone pod)
 			pod := &corev1.Pod{
@@ -337,7 +336,7 @@ var _ = Describe("PodVAMapper", func() {
 					Namespace: "namespace-a",
 				},
 			}
-			deployments["namespace-a/va-a"] = deploymentA
+			deployments["namespace-a/shared-deploy"] = deploymentA
 
 			// Deployment in namespace-b (same deployment name, different namespace)
 			deploymentB := &appsv1.Deployment{
@@ -346,7 +345,7 @@ var _ = Describe("PodVAMapper", func() {
 					Namespace: "namespace-b",
 				},
 			}
-			deployments["namespace-b/va-b"] = deploymentB
+			deployments["namespace-b/shared-deploy"] = deploymentB
 
 			// VA in namespace-a targeting shared-deploy
 			vaA := createVA("va-a", "namespace-a", "shared-deploy")

internal/engines/saturation/engine.go

@@ -330,7 +330,7 @@ func (e *Engine) BuildVariantStates(
 
 		// Try to look up in provided map first (optimization)
 		if deployments != nil {
-			deploy, found = deployments[utils.GetVariantKey(va.Namespace, va.Name)]
+			deploy, found = deployments[utils.GetDeploymentKey(va.Namespace, va.GetScaleTargetName())]
 		}
 
 		if !found {
@@ -528,9 +528,12 @@ func (e *Engine) RunSaturationAnalysis(
 			}
 		}
 
+		// Populate maps indexed by Deployment namespace/name
+		deploymentKey := utils.GetDeploymentKey(va.Namespace, va.GetScaleTargetName())
+		deployments[deploymentKey] = &deploy
+
 		// Populate maps indexed by VariantAutoscaling namespace/name
 		variantKey := utils.GetVariantKey(va.Namespace, va.Name)
-		deployments[variantKey] = &deploy
 		variantAutoscalings[variantKey] = va
 		variantCosts[variantKey] = cost
 	}

internal/utils/variant.go

@@ -216,3 +216,8 @@ func GetDesiredReplicas(deploy *appsv1.Deployment) int32 {
 func GetVariantKey(namespace, name string) string {
 	return namespace + "/" + name
 }
+
+// GetDeploymentKey returns a unique key for a Deployment combining namespace and name.
+func GetDeploymentKey(namespace, name string) string {
+	return namespace + "/" + name
+}