From e8322225eeb70cc566913fca2e89e9137c0ab79f Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Tue, 21 Feb 2023 19:49:09 +0000 Subject: [PATCH] [KMSv2] restructure kms staging dir Signed-off-by: Anish Ramasekar Kubernetes-commit: c9b8ad6a55aaf7d95ce6fbc06ec4afba905e86c0 --- pkg/server/options/encryptionconfig/config.go | 2 +- pkg/server/options/encryptionconfig/config_test.go | 2 +- pkg/storage/value/encrypt/envelope/kmsv2/envelope.go | 2 +- pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go | 2 +- pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go | 2 +- .../value/encrypt/envelope/kmsv2/grpc_service_unix_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/server/options/encryptionconfig/config.go b/pkg/server/options/encryptionconfig/config.go index 7b15de0d0..3f73a3d54 100644 --- a/pkg/server/options/encryptionconfig/config.go +++ b/pkg/server/options/encryptionconfig/config.go @@ -51,7 +51,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/secretbox" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/pkg/server/options/encryptionconfig/config_test.go b/pkg/server/options/encryptionconfig/config_test.go index 8eb8d74c4..d0f5ab381 100644 --- a/pkg/server/options/encryptionconfig/config_test.go +++ b/pkg/server/options/encryptionconfig/config_test.go @@ -40,7 +40,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go b/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go index 3c9f30688..ae37f178b 100644 --- a/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go +++ b/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go @@ -34,7 +34,7 @@ import ( kmstypes "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1" "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" "k8s.io/klog/v2" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" "k8s.io/utils/clock" ) diff --git a/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go b/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go index 2c9b64e61..49e0370e7 100644 --- a/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go +++ b/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go b/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go index b56bbd512..1ebdfe34f 100644 --- a/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go +++ b/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util" "k8s.io/klog/v2" kmsapi "k8s.io/kms/apis/v2alpha1" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go b/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go index 290e3d553..92be4d457 100644 --- a/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go +++ b/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/component-base/metrics/testutil" "k8s.io/apimachinery/pkg/util/uuid" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const (