github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114922 from ibihim/kmsv2-interface-move

Browse Source 
[KMSv2] apiserver/kmsv2: mv Service interface into kmsv2
This commit is contained in:
Kubernetes Prow Robot
2023-01-17 10:10:33 -08:00
committed by GitHub
parent 5550064bc2 b7701b00ea
commit f7b02260f6
9 changed files with 40 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/controlplane/transformation/kmsv2_transformation_test.go
View File

@@ -40,13 +40,13 @@ import (
"k8s.io/apiserver/pkg/server/options/encryptionconfig"
"k8s.io/apiserver/pkg/storage/value"
aestransformer "k8s.io/apiserver/pkg/storage/value/encrypt/aes"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2"
kmstypes "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1"
kmsv2mock "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v2alpha1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/dynamic"
featuregatetesting "k8s.io/component-base/featuregate/testing"
kmsv2api "k8s.io/kms/apis/v2alpha1"
kmsv2svc "k8s.io/kms/service"
"k8s.io/kubernetes/test/integration/etcd"
)
@@ -300,7 +300,7 @@ func TestKMSv2SingleService(t *testing.T) {
var kmsv2Calls int
origEnvelopeKMSv2ServiceFactory := encryptionconfig.EnvelopeKMSv2ServiceFactory
encryptionconfig.EnvelopeKMSv2ServiceFactory = func(ctx context.Context, endpoint string, callTimeout time.Duration) (kmsv2.Service, error) {
encryptionconfig.EnvelopeKMSv2ServiceFactory = func(ctx context.Context, endpoint string, callTimeout time.Duration) (kmsv2svc.Service, error) {
kmsv2Calls++
return origEnvelopeKMSv2ServiceFactory(ctx, endpoint, callTimeout)
}