kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115938 from aramase/aramase/f/organize-kms-pkg 

[KMSv2] restructure kms staging dir

Kubernetes-commit: 403a46037df29d08b4aaf1043345bf75feba77b1
This commit is contained in:
Kubernetes Publisher 2023-02-21 17:26:03 -08:00
parent 83c4b5b2c6 e8322225ee
commit 07630bb938
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -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
)

4
go.sum
View File

@ -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=

2
pkg/server/options/encryptionconfig/config.go
View File

@ -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 (

2
pkg/server/options/encryptionconfig/config_test.go
View File

@ -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 (

2
pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
View File

@ -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"
)

2
pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
View File

@ -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"
)

2
pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go
View File

@ -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 (

2
pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go
View File

@ -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 (