Add some feedback

Author: bjee19

cmd/gateway/commands.go

@@ -153,6 +153,7 @@ func createStaticModeCommand() *cobra.Command {
 					PodIP:       podIP,
 					ServiceName: serviceName.value,
 					Namespace:   namespace,
+					Name:        podName,
 				},
 				HealthConfig: config.HealthConfig{
 					Enabled: !disableHealth,

deploy/helm-chart/templates/rbac.yaml

@@ -36,7 +36,7 @@ rules:
   - create
   - patch
 - apiGroups:
-    - "apps"
+    - apps
   resources:
     - replicasets
   verbs:

internal/mode/static/config/config.go

@@ -48,6 +48,8 @@ type GatewayPodConfig struct {
 	ServiceName string
 	// Namespace is the namespace of this Pod.
 	Namespace string
+	// Name is the name of the Pod.
+	Name string
 }
 
 // MetricsConfig specifies the metrics config.

internal/mode/static/manager.go

@@ -222,7 +222,7 @@ func StartManager(cfg config.Config) error {
 		Version:             cfg.Version,
 		PodNSName: types.NamespacedName{
 			Namespace: cfg.GatewayPodConfig.Namespace,
-			Name:      cfg.LeaderElection.Identity,
+			Name:      cfg.GatewayPodConfig.Name,
 		},
 	})
 	if err = mgr.Add(createTelemetryJob(cfg, dataCollector, nginxChecker.getReadyCh())); err != nil {

internal/mode/static/telemetry/collector.go

@@ -161,37 +161,35 @@ func collectGraphResourceCount(
 
 func collectNGFReplicaCount(ctx context.Context, k8sClient client.Reader, podNSName types.NamespacedName) (int, error) {
 	var pod v1.Pod
-	if err := k8sClient.Get(ctx,
+	if err := k8sClient.Get(
+		ctx,
 		types.NamespacedName{Namespace: podNSName.Namespace, Name: podNSName.Name},
 		&pod,
 	); err != nil {
 		return 0, err
 	}
 
 	podOwnerRefs := pod.GetOwnerReferences()
-	if podOwnerRefs == nil {
-		return 0, errors.New("could not get owner reference of NGF Pod")
-	}
 	if len(podOwnerRefs) != 1 {
-		return 0, errors.New("multiple owner references of NGF Pod")
+		return 0, fmt.Errorf("expected one owner reference of the NGF Pod, got %d", len(podOwnerRefs))
 	}
 
-	switch kind := podOwnerRefs[0].Kind; kind {
-	case "ReplicaSet":
-		var replicaSet appsv1.ReplicaSet
-		if err := k8sClient.Get(ctx,
-			types.NamespacedName{Namespace: podNSName.Namespace, Name: podOwnerRefs[0].Name},
-			&replicaSet,
-		); err != nil {
-			return 0, err
-		}
+	if podOwnerRefs[0].Kind != "ReplicaSet" {
+		return 0, fmt.Errorf("expected pod owner reference to be ReplicaSet, got %s", podOwnerRefs[0].Kind)
+	}
 
-		if replicaSet.Spec.Replicas == nil {
-			return 0, errors.New("replica set replicas was nil")
-		}
+	var replicaSet appsv1.ReplicaSet
+	if err := k8sClient.Get(
+		ctx,
+		types.NamespacedName{Namespace: podNSName.Namespace, Name: podOwnerRefs[0].Name},
+		&replicaSet,
+	); err != nil {
+		return 0, err
+	}
 
-		return int(*replicaSet.Spec.Replicas), nil
-	default:
-		return 0, fmt.Errorf("pod owner reference was not ReplicaSet, instead was %s", kind)
+	if replicaSet.Spec.Replicas == nil {
+		return 0, errors.New("replica set replicas was nil")
 	}
+
+	return int(*replicaSet.Spec.Replicas), nil
 }