From 8b26b6eec1b0d99518e7c53879e1d44ade2eebc7 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Wed, 17 Jan 2024 17:05:53 -0800 Subject: [PATCH] refactor: move celmetrics close to its usage in vap does not need to be accessed from anywhere else, and removed an excessive lonesome `cel` pkg with just the metrics --- .../admission/plugin/validatingadmissionpolicy/controller.go | 2 +- .../plugin/validatingadmissionpolicy/controller_reconcile.go | 2 +- .../validatingadmissionpolicy/metrics}/metrics.go | 0 .../validatingadmissionpolicy/metrics}/metrics_test.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename staging/src/k8s.io/apiserver/pkg/admission/{cel => plugin/validatingadmissionpolicy/metrics}/metrics.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/{cel => plugin/validatingadmissionpolicy/metrics}/metrics_test.go (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go index 46b76e06d5f..a0e50edb568 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go @@ -37,9 +37,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" - celmetrics "k8s.io/apiserver/pkg/admission/cel" "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" + celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" celconfig "k8s.io/apiserver/pkg/apis/cel" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/warning" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go index 9cd3c01aed3..1924c14d92b 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" - celmetrics "k8s.io/apiserver/pkg/admission/cel" "k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" + celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/cel/environment" "k8s.io/client-go/dynamic" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/cel/metrics.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/cel/metrics.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/cel/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/cel/metrics_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics_test.go