do not try to observe cluster resource quotas when namespace limit ha…

…s been specified

Signed-off-by: Florian Bacher <[email protected]>

receiver/k8sclusterreceiver/receiver_test.go

@@ -93,6 +93,57 @@ func TestReceiver(t *testing.T) {
 	require.NoError(t, r.Shutdown(ctx))
 }
 
+func TestNamespacedReceiver(t *testing.T) {
+	tt, err := componenttest.SetupTelemetry(component.NewID(metadata.Type))
+	require.NoError(t, err)
+	defer func() {
+		require.NoError(t, tt.Shutdown(context.Background()))
+	}()
+
+	client := newFakeClientWithAllResources()
+	osQuotaClient := fakeQuota.NewSimpleClientset()
+	sink := new(consumertest.MetricsSink)
+
+	r := setupReceiver(client, osQuotaClient, sink, nil, 10*time.Second, tt, "test")
+
+	// Setup k8s resources.
+	numPods := 2
+	numNodes := 1
+	numQuotas := 2
+
+	createPods(t, client, numPods)
+	createNodes(t, client, numNodes)
+	createClusterQuota(t, osQuotaClient, numQuotas)
+
+	ctx := context.Background()
+	require.NoError(t, r.Start(ctx, newNopHost()))
+
+	// Expects metric data from pods  only, where each metric data
+	// struct corresponds to one resource.
+	// Nodes and ClusterResourceQuotas should not be observed as these are non-namespaced resources
+	expectedNumMetrics := numPods
+	var initialDataPointCount int
+	require.Eventually(t, func() bool {
+		initialDataPointCount = sink.DataPointCount()
+		return initialDataPointCount == expectedNumMetrics
+	}, 10*time.Second, 100*time.Millisecond,
+		"metrics not collected")
+
+	numPodsToDelete := 1
+	deletePods(t, client, numPodsToDelete)
+
+	// Expects metric data from a node, since other resources were deleted.
+	expectedNumMetrics = numPods - numPodsToDelete
+	var metricsCountDelta int
+	require.Eventually(t, func() bool {
+		metricsCountDelta = sink.DataPointCount() - initialDataPointCount
+		return metricsCountDelta == expectedNumMetrics
+	}, 10*time.Second, 100*time.Millisecond,
+		"updated metrics not collected")
+
+	require.NoError(t, r.Shutdown(ctx))
+}
+
 func TestReceiverTimesOutAfterStartup(t *testing.T) {
 	tt, err := componenttest.SetupTelemetry(component.NewID(metadata.Type))
 	require.NoError(t, err)

receiver/k8sclusterreceiver/testdata/e2e/namespace-scoped/collector/role.yaml

@@ -14,7 +14,6 @@ rules:
       - pods/status
       - replicationcontrollers
       - replicationcontrollers/status
-      - resourcequotas
       - services
     verbs:
       - get

receiver/k8sclusterreceiver/watcher.go

@@ -90,7 +90,7 @@ func (rw *resourceWatcher) initialize() error {
 	}
 	rw.client = client
 
-	if rw.config.Distribution == distributionOpenShift {
+	if rw.config.Distribution == distributionOpenShift && rw.config.Namespace == "" {
 		rw.osQuotaClient, err = rw.makeOpenShiftQuotaClient(rw.config.APIConfig)
 		if err != nil {
 			return fmt.Errorf("Failed to create OpenShift quota API client: %w", err)