cleanup after refactoring

Author: piceri

internal/controller/controller.go

@@ -429,8 +429,8 @@ func (c *Controller) recordContainer(ctx context.Context, pod *corev1.Pod, conta
 	// Gather aggregate metadata for adds/updates
 	var runtimeRisks []deploymentrecord.RuntimeRisk
 	if status != deploymentrecord.StatusDecommissioned {
-		metadata := c.aggregateMetadata(ctx, podToPartialMetadata(pod))
-		for risk := range metadata.RuntimeRisks {
+		aggMetadata := c.aggregateMetadata(ctx, podToPartialMetadata(pod))
+		for risk := range aggMetadata.RuntimeRisks {
 			runtimeRisks = append(runtimeRisks, risk)
 		}
 	}
@@ -496,9 +496,9 @@ func (c *Controller) recordContainer(ctx context.Context, pod *corev1.Pod, conta
 	return nil
 }
 
-// aggregateRuntimeRisks aggregates metadata for a pod and its owners.
+// aggregateMetadata returns aggregated metadata for a pod and its owners.
 func (c *Controller) aggregateMetadata(ctx context.Context, obj *metav1.PartialObjectMetadata) AggregatePodMetadata {
-	metadata := AggregatePodMetadata{
+	aggMetadata := AggregatePodMetadata{
 		RuntimeRisks: make(map[deploymentrecord.RuntimeRisk]bool),
 	}
 	queue := []*metav1.PartialObjectMetadata{obj}
@@ -517,14 +517,14 @@ func (c *Controller) aggregateMetadata(ctx context.Context, obj *metav1.PartialO
 		}
 		visited[current.GetUID()] = true
 
-		getMetadataFromObject(current, metadata)
+		getMetadataFromObject(current, aggMetadata)
 		c.addOwnersToQueue(ctx, current, &queue)
 	}
 
-	return metadata
+	return aggMetadata
 }
 
-// collectRuntimeRisksFromOwners takes a current object and looks up its owners, adding them to the queue for processing
+// addOwnersToQueue takes a current object and looks up its owners, adding them to the queue for processing
 // to collect their metadata.
 func (c *Controller) addOwnersToQueue(ctx context.Context, current *metav1.PartialObjectMetadata, queue *[]*metav1.PartialObjectMetadata) {
 	ownerRefs := current.GetOwnerReferences()
@@ -551,21 +551,16 @@ func (c *Controller) addOwnersToQueue(ctx context.Context, current *metav1.Parti
 
 // getOwnerMetadata retrieves partial object metadata for an owner ref.
 func (c *Controller) getOwnerMetadata(ctx context.Context, namespace string, owner metav1.OwnerReference) (*metav1.PartialObjectMetadata, error) {
-	var gvr schema.GroupVersionResource
+	gvr := schema.GroupVersionResource{
+		Group:   "apps",
+		Version: "v1",
+	}
 
 	switch owner.Kind {
 	case "ReplicaSet":
-		gvr = schema.GroupVersionResource{
-			Group:    "apps",
-			Version:  "v1",
-			Resource: "replicasets",
-		}
+		gvr.Resource = "replicasets"
 	case "Deployment":
-		gvr = schema.GroupVersionResource{
-			Group:    "apps",
-			Version:  "v1",
-			Resource: "deployments",
-		}
+		gvr.Resource = "deployments"
 	default:
 		slog.Debug("Unsupported owner kind for runtime risk collection",
 			"kind", owner.Kind,