diff --git a/go.mod b/go.mod index a2434ac46..86da4f067 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( k8s.io/client-go v0.0.0-20230222010551-1ea719588ec9 k8s.io/component-base v0.0.0-20230215215219-ae9be4dda9da k8s.io/klog/v2 v2.80.1 - k8s.io/kms v0.0.0-20230222011722-d42d0d0bd8f5 + k8s.io/kms v0.0.0-20230222012603-8e0376668e8f k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 @@ -128,5 +128,5 @@ replace ( k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230221210005-6f5782f4e5f2 k8s.io/client-go => k8s.io/client-go v0.0.0-20230222010551-1ea719588ec9 k8s.io/component-base => k8s.io/component-base v0.0.0-20230215215219-ae9be4dda9da - k8s.io/kms => k8s.io/kms v0.0.0-20230222011722-d42d0d0bd8f5 + k8s.io/kms => k8s.io/kms v0.0.0-20230222012603-8e0376668e8f ) diff --git a/go.sum b/go.sum index c244faa1c..37494db3b 100644 --- a/go.sum +++ b/go.sum @@ -1005,8 +1005,8 @@ k8s.io/component-base v0.0.0-20230215215219-ae9be4dda9da h1:tgXu2y67YqUXP4txgy1v k8s.io/component-base v0.0.0-20230215215219-ae9be4dda9da/go.mod h1:GgrhCRrPLmN9lWoh+m52a6iHKG3zx8KJyclgqPgbFDQ= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.0.0-20230222011722-d42d0d0bd8f5 h1:Y7syXdGg7SK7nlg5t/FrDDiyyUSnEXJqahinobC0pzA= -k8s.io/kms v0.0.0-20230222011722-d42d0d0bd8f5/go.mod h1:qYXc/GQX5UXnMDu5D7O72nmpVVZSuWp2b6QPhIiSK8I= +k8s.io/kms v0.0.0-20230222012603-8e0376668e8f h1:CerhIHmxgK+a8gyUKShrWwYcr8XqYRzIwQIJA6U/kWY= +k8s.io/kms v0.0.0-20230222012603-8e0376668e8f/go.mod h1:qYXc/GQX5UXnMDu5D7O72nmpVVZSuWp2b6QPhIiSK8I= k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU= k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= 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 (