Revert control plane count implementation

Author: bjee19

internal/mode/static/telemetry/collector.go

@@ -12,13 +12,11 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	k8sversion "k8s.io/apimachinery/pkg/util/version"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
-	"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/kinds"
 	"github.com/nginx/nginx-gateway-fabric/internal/mode/static/config"
 	"github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane"
@@ -158,6 +156,11 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		return Data{}, fmt.Errorf("failed to get replica set for pod %v: %w", c.cfg.PodNSName, err)
 	}
 
+	replicaCount, err := getReplicas(replicaSet)
+	if err != nil {
+		return Data{}, fmt.Errorf("failed to collect NGF replica count: %w", err)
+	}
+
 	deploymentID, err := getDeploymentID(replicaSet)
 	if err != nil {
 		return Data{}, fmt.Errorf("failed to get NGF deploymentID: %w", err)
@@ -167,8 +170,6 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 
 	nginxPodCount := getNginxPodCount(g)
 
-	controlPlanePodCount := getControlPlanePodCount(ctx, c.cfg.K8sClientReader)
-
 	data := Data{
 		Data: tel.Data{
 			ProjectName:         "NGF",
@@ -187,7 +188,7 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		SnippetsFiltersDirectives:      snippetsFiltersDirectives,
 		SnippetsFiltersDirectivesCount: snippetsFiltersDirectivesCount,
 		NginxPodCount:                  nginxPodCount,
-		ControlPlanePodCount:           controlPlanePodCount,
+		ControlPlanePodCount:           int64(replicaCount),
 	}
 
 	return data, nil
@@ -327,6 +328,14 @@ func getPodReplicaSet(
 	return &replicaSet, nil
 }
 
+func getReplicas(replicaSet *appsv1.ReplicaSet) (int, error) {
+	if replicaSet.Spec.Replicas == nil {
+		return 0, errors.New("replica set replicas was nil")
+	}
+
+	return int(*replicaSet.Spec.Replicas), nil
+}
+
 // getDeploymentID gets the deployment ID of the provided ReplicaSet.
 func getDeploymentID(replicaSet *appsv1.ReplicaSet) (string, error) {
 	replicaOwnerRefs := replicaSet.GetOwnerReferences()
@@ -524,16 +533,3 @@ func getNginxPodCount(g *graph.Graph) int64 {
 
 	return count
 }
-
-func getControlPlanePodCount(ctx context.Context, k8sClient client.Reader) int64 {
-	var podList v1.PodList
-	opts := &client.ListOptions{
-		LabelSelector: labels.SelectorFromSet(labels.Set{controller.AppNameLabel: "nginx-gateway-fabric"}),
-	}
-
-	if err := k8sClient.List(ctx, &podList, opts); err != nil {
-		return 0
-	}
-
-	return int64(len(podList.Items))
-}

internal/mode/static/telemetry/collector_test.go

@@ -19,7 +19,6 @@ import (
 
 	ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
 	"github.com/nginx/nginx-gateway-fabric/apis/v1alpha2"
-	"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/kinds"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/kubernetes/kubernetesfakes"
@@ -88,7 +87,6 @@ var _ = Describe("Collector", Ordered, func() {
 		baseListCalls           listCallsFunc
 		flags                   config.Flags
 		nodeList                *v1.NodeList
-		podList                 *v1.PodList
 	)
 
 	BeforeAll(func() {
@@ -157,17 +155,6 @@ var _ = Describe("Collector", Ordered, func() {
 				},
 			},
 		}
-
-		podList = &v1.PodList{
-			Items: []v1.Pod{
-				{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:   "ngf-pod-1",
-						Labels: map[string]string{controller.AppNameLabel: "nginx-gateway-fabric"},
-					},
-				},
-			},
-		}
 	})
 
 	BeforeEach(func() {
@@ -211,7 +198,7 @@ var _ = Describe("Collector", Ordered, func() {
 		baseGetCalls = createGetCallsFunc(ngfPod, ngfReplicaSet, kubeNamespace)
 		k8sClientReader.GetCalls(baseGetCalls)
 
-		baseListCalls = createListCallsFunc(nodeList, podList)
+		baseListCalls = createListCallsFunc(nodeList)
 		k8sClientReader.ListCalls(baseListCalls)
 	})
 
@@ -273,24 +260,25 @@ var _ = Describe("Collector", Ordered, func() {
 					},
 				}
 
-				podList := &v1.PodList{
-					Items: []v1.Pod{
-						{
-							ObjectMeta: metav1.ObjectMeta{
-								Name:   "ngf-pod-1",
-								Labels: map[string]string{controller.AppNameLabel: "nginx-gateway-fabric"},
-							},
+				k8sClientReader.ListCalls(createListCallsFunc(nodes))
+
+				k8sClientReader.GetCalls(mergeGetCallsWithBase(createGetCallsFunc(
+					&appsv1.ReplicaSet{
+						Spec: appsv1.ReplicaSetSpec{
+							Replicas: helpers.GetPointer(int32(2)),
 						},
-						{
-							ObjectMeta: metav1.ObjectMeta{
-								Name:   "ngf-pod-2",
-								Labels: map[string]string{controller.AppNameLabel: "nginx-gateway-fabric"},
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "replica",
+							OwnerReferences: []metav1.OwnerReference{
+								{
+									Kind: "Deployment",
+									Name: "Deployment1",
+									UID:  "test-uid-replicaSet",
+								},
 							},
 						},
 					},
-				}
-
-				k8sClientReader.ListCalls(createListCallsFunc(nodes, podList))
+				)))
 
 				secret1 := &v1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "secret1"}}
 				secret2 := &v1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "secret2"}}
@@ -587,7 +575,7 @@ var _ = Describe("Collector", Ordered, func() {
 						},
 					}
 
-					k8sClientReader.ListCalls(createListCallsFunc(nodes, podList))
+					k8sClientReader.ListCalls(createListCallsFunc(nodes))
 					expData.ClusterVersion = "unknown"
 					expData.ClusterPlatform = "k3s"
 
@@ -603,7 +591,7 @@ var _ = Describe("Collector", Ordered, func() {
 	Describe("node count collector", func() {
 		When("collecting node count data", func() {
 			It("collects correct data for one node", func(ctx SpecContext) {
-				k8sClientReader.ListCalls(createListCallsFunc(nodeList, podList))
+				k8sClientReader.ListCalls(createListCallsFunc(nodeList))
 
 				expData.ClusterNodeCount = 1
 
@@ -899,6 +887,20 @@ var _ = Describe("Collector", Ordered, func() {
 					Expect(err).To(MatchError(expectedErr))
 				})
 
+				It("should error if the replica set's replicas is nil", func(ctx SpecContext) {
+					expectedErr := errors.New("replica set replicas was nil")
+					k8sClientReader.GetCalls(mergeGetCallsWithBase(createGetCallsFunc(
+						&appsv1.ReplicaSet{
+							Spec: appsv1.ReplicaSetSpec{
+								Replicas: nil,
+							},
+						},
+					)))
+
+					_, err := dataCollector.Collect(ctx)
+					Expect(err).To(MatchError(expectedErr))
+				})
+
 				It("should error if the kubernetes client errored when getting the ReplicaSet", func(ctx SpecContext) {
 					expectedErr := errors.New("there was an error getting the ReplicaSet")
 					k8sClientReader.GetCalls(mergeGetCallsWithBase(