From 1b90507cfab7181f6f05cdd7ae1afd9465979dfc Mon Sep 17 00:00:00 2001 From: helayoty Date: Wed, 18 Mar 2026 15:27:56 +0000 Subject: [PATCH] move protectionutil pkg to controller/util Signed-off-by: helayoty --- pkg/controller/{volume => util}/protectionutil/utils.go | 0 pkg/controller/{volume => util}/protectionutil/utils_test.go | 0 pkg/controller/{volume => util}/protectionutil/wrappers.go | 0 .../volume/pvcprotection/pvc_protection_controller.go | 2 +- pkg/controller/volume/pvprotection/pv_protection_controller.go | 2 +- .../volume/vacprotection/vac_protection_controller.go | 2 +- .../volume/vacprotection/vac_protection_controller_test.go | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename pkg/controller/{volume => util}/protectionutil/utils.go (100%) rename pkg/controller/{volume => util}/protectionutil/utils_test.go (100%) rename pkg/controller/{volume => util}/protectionutil/wrappers.go (100%) diff --git a/pkg/controller/volume/protectionutil/utils.go b/pkg/controller/util/protectionutil/utils.go similarity index 100% rename from pkg/controller/volume/protectionutil/utils.go rename to pkg/controller/util/protectionutil/utils.go diff --git a/pkg/controller/volume/protectionutil/utils_test.go b/pkg/controller/util/protectionutil/utils_test.go similarity index 100% rename from pkg/controller/volume/protectionutil/utils_test.go rename to pkg/controller/util/protectionutil/utils_test.go diff --git a/pkg/controller/volume/protectionutil/wrappers.go b/pkg/controller/util/protectionutil/wrappers.go similarity index 100% rename from pkg/controller/volume/protectionutil/wrappers.go rename to pkg/controller/util/protectionutil/wrappers.go diff --git a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go index 526016d1dc0..e914da7699f 100644 --- a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go +++ b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go @@ -34,8 +34,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/component-helpers/storage/ephemeral" "k8s.io/klog/v2" + "k8s.io/kubernetes/pkg/controller/util/protectionutil" "k8s.io/kubernetes/pkg/controller/volume/common" - "k8s.io/kubernetes/pkg/controller/volume/protectionutil" "k8s.io/kubernetes/pkg/util/slice" volumeutil "k8s.io/kubernetes/pkg/volume/util" ) diff --git a/pkg/controller/volume/pvprotection/pv_protection_controller.go b/pkg/controller/volume/pvprotection/pv_protection_controller.go index 1b748226d04..161ef7a370b 100644 --- a/pkg/controller/volume/pvprotection/pv_protection_controller.go +++ b/pkg/controller/volume/pvprotection/pv_protection_controller.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/controller/volume/protectionutil" + "k8s.io/kubernetes/pkg/controller/util/protectionutil" "k8s.io/kubernetes/pkg/util/slice" volumeutil "k8s.io/kubernetes/pkg/volume/util" ) diff --git a/pkg/controller/volume/vacprotection/vac_protection_controller.go b/pkg/controller/volume/vacprotection/vac_protection_controller.go index a9ede7f5da8..10f22d9d9e2 100644 --- a/pkg/controller/volume/vacprotection/vac_protection_controller.go +++ b/pkg/controller/volume/vacprotection/vac_protection_controller.go @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/controller/volume/protectionutil" + "k8s.io/kubernetes/pkg/controller/util/protectionutil" "k8s.io/kubernetes/pkg/util/slice" volumeutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/utils/ptr" diff --git a/pkg/controller/volume/vacprotection/vac_protection_controller_test.go b/pkg/controller/volume/vacprotection/vac_protection_controller_test.go index 537755801e8..93d7b827783 100644 --- a/pkg/controller/volume/vacprotection/vac_protection_controller_test.go +++ b/pkg/controller/volume/vacprotection/vac_protection_controller_test.go @@ -34,7 +34,7 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/volume/protectionutil" + "k8s.io/kubernetes/pkg/controller/util/protectionutil" volumeutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/utils/dump" )