From 95dbfa1c3d2f62e5d0f52788a2dd19fc61ca0a36 Mon Sep 17 00:00:00 2001 From: cici37 Date: Fri, 19 Jul 2024 20:46:33 +0000 Subject: [PATCH] Promote metrics for VAP and CRD validation rules to beta. --- .../admission/plugin/policy/validating/metrics/metrics.go | 4 ++-- .../plugin/policy/validating/metrics/metrics_test.go | 8 ++++---- staging/src/k8s.io/apiserver/pkg/cel/metrics/metrics.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics.go index 15e6fbe5421..92c8ee2b85a 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics.go @@ -63,7 +63,7 @@ func newValidationAdmissionMetrics() *ValidatingAdmissionPolicyMetrics { Subsystem: metricsSubsystem, Name: "check_total", Help: "Validation admission policy check total, labeled by policy and further identified by binding and enforcement action taken.", - StabilityLevel: metrics.ALPHA, + StabilityLevel: metrics.BETA, }, []string{"policy", "policy_binding", "error_type", "enforcement_action"}, ) @@ -81,7 +81,7 @@ func newValidationAdmissionMetrics() *ValidatingAdmissionPolicyMetrics { // around 760ms, so that bucket should only ever have the slowest CEL expressions // in it Buckets: []float64{0.0000005, 0.001, 0.01, 0.1, 1.0}, - StabilityLevel: metrics.ALPHA, + StabilityLevel: metrics.BETA, }, []string{"policy", "policy_binding", "error_type", "enforcement_action"}, ) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics_test.go index ad450001b90..829f3ec1ead 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics_test.go @@ -43,7 +43,7 @@ func TestNoUtils(t *testing.T) { { desc: "observe policy admission", want: ` - # HELP apiserver_validating_admission_policy_check_duration_seconds [ALPHA] Validation admission latency for individual validation expressions in seconds, labeled by policy and further including binding and enforcement action taken. + # HELP apiserver_validating_admission_policy_check_duration_seconds [BETA] Validation admission latency for individual validation expressions in seconds, labeled by policy and further including binding and enforcement action taken. # TYPE apiserver_validating_admission_policy_check_duration_seconds histogram apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0 apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0 @@ -53,7 +53,7 @@ func TestNoUtils(t *testing.T) { apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1 apiserver_validating_admission_policy_check_duration_seconds_sum{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 10 apiserver_validating_admission_policy_check_duration_seconds_count{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1 - # HELP apiserver_validating_admission_policy_check_total [ALPHA] Validation admission policy check total, labeled by policy and further identified by binding and enforcement action taken. + # HELP apiserver_validating_admission_policy_check_total [BETA] Validation admission policy check total, labeled by policy and further identified by binding and enforcement action taken. # TYPE apiserver_validating_admission_policy_check_total counter apiserver_validating_admission_policy_check_total{enforcement_action="allow",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1 `, @@ -64,7 +64,7 @@ func TestNoUtils(t *testing.T) { { desc: "observe policy rejection", want: ` - # HELP apiserver_validating_admission_policy_check_duration_seconds [ALPHA] Validation admission latency for individual validation expressions in seconds, labeled by policy and further including binding and enforcement action taken. + # HELP apiserver_validating_admission_policy_check_duration_seconds [BETA] Validation admission latency for individual validation expressions in seconds, labeled by policy and further including binding and enforcement action taken. # TYPE apiserver_validating_admission_policy_check_duration_seconds histogram apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0 apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0 @@ -74,7 +74,7 @@ func TestNoUtils(t *testing.T) { apiserver_validating_admission_policy_check_duration_seconds_bucket{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1 apiserver_validating_admission_policy_check_duration_seconds_sum{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 10 apiserver_validating_admission_policy_check_duration_seconds_count{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1 - # HELP apiserver_validating_admission_policy_check_total [ALPHA] Validation admission policy check total, labeled by policy and further identified by binding and enforcement action taken. + # HELP apiserver_validating_admission_policy_check_total [BETA] Validation admission policy check total, labeled by policy and further identified by binding and enforcement action taken. # TYPE apiserver_validating_admission_policy_check_total counter apiserver_validating_admission_policy_check_total{enforcement_action="deny",error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1 `, diff --git a/staging/src/k8s.io/apiserver/pkg/cel/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/cel/metrics/metrics.go index 66b7dd8cfb0..02f232c17c2 100644 --- a/staging/src/k8s.io/apiserver/pkg/cel/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/cel/metrics/metrics.go @@ -44,14 +44,14 @@ func newCelMetrics() *CelMetrics { Subsystem: subsystem, Name: "compilation_duration_seconds", Help: "CEL compilation time in seconds.", - StabilityLevel: metrics.ALPHA, + StabilityLevel: metrics.BETA, }), evaluationTime: metrics.NewHistogram(&metrics.HistogramOpts{ Namespace: namespace, Subsystem: subsystem, Name: "evaluation_duration_seconds", Help: "CEL evaluation time in seconds.", - StabilityLevel: metrics.ALPHA, + StabilityLevel: metrics.BETA, }), }