UPSTREAM: <carry>: PSa metrics: unset ocp_namespace on non-platform n…

…amespaces
openshift · Feb 27, 2023 · d405dc9 · d405dc9
1 parent 8923264
commit d405dc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/staging/src/k8s.io/pod-security-admission/metrics/metrics.go b/staging/src/k8s.io/pod-security-admission/metrics/metrics.go
@@ -104,7 +104,8 @@ func (r *PrometheusRecorder) RecordEvaluation(decision Decision, policy api.Leve
 		strings.HasPrefix(namespace, "openshift-") ||
 		strings.HasPrefix(namespace, "kube-") ||
 		namespace == "default") {
-		namespace = "non-platform"
+		// remove non-OpenShift platform namespace names to prevent cardinality explosion
+		namespace = ""
 	}
 
 	el := evaluationsLabels{

diff --git a/staging/src/k8s.io/pod-security-admission/metrics/metrics_test.go b/staging/src/k8s.io/pod-security-admission/metrics/metrics_test.go
@@ -77,13 +77,12 @@ func TestRecordEvaluation(t *testing.T) {
 							if level == api.LevelPrivileged {
 								expectedVersion = "latest"
 							}
-							expectedNamespace := "non-platform"
 
 							expected := fmt.Sprintf(`
 							# HELP pod_security_evaluations_total [ALPHA] Number of policy evaluations that occurred, not counting ignored or exempt requests.
         	            	# TYPE pod_security_evaluations_total counter
-							pod_security_evaluations_total{decision="%s",mode="%s",ocp_namespace="%s",policy_level="%s",policy_version="%s",request_operation="%s",resource="%s",subresource=""} 1
-							`, decision, mode, expectedNamespace, level, expectedVersion, strings.ToLower(string(op)), expectedResource)
+							pod_security_evaluations_total{decision="%s",mode="%s",ocp_namespace="",policy_level="%s",policy_version="%s",request_operation="%s",resource="%s",subresource=""} 1
+							`, decision, mode, level, expectedVersion, strings.ToLower(string(op)), expectedResource)
 							expected = expectCachedMetrics("pod_security_evaluations_total", expected)
 
 							assert.NoError(t, testutil.GatherAndCompare(registry, bytes.NewBufferString(expected), "pod_security_evaluations_total"))