From b8100ceec3866119ae7efad602a2ae4aca7e13c6 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Fri, 29 Sep 2017 14:44:13 +0800 Subject: [PATCH 1/2] remove unused filed --- .../apiserver/pkg/storage/value/encrypt/envelope/envelope.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/envelope.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/envelope.go index acb26e6f5ed..9782e44b66d 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/envelope.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/envelope.go @@ -46,9 +46,6 @@ type envelopeTransformer struct { // transformers is a thread-safe LRU cache which caches decrypted DEKs indexed by their encrypted form. transformers *lru.Cache - // cacheSize is the maximum number of DEKs that are cached. - cacheSize int - // baseTransformerFunc creates a new transformer for encrypting the data with the DEK. baseTransformerFunc func(cipher.Block) value.Transformer } @@ -68,7 +65,6 @@ func NewEnvelopeTransformer(envelopeService Service, cacheSize int, baseTransfor return &envelopeTransformer{ envelopeService: envelopeService, transformers: cache, - cacheSize: cacheSize, baseTransformerFunc: baseTransformerFunc, }, nil } From 81d87466c89772c11b460cdb02df488ffb58d770 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Fri, 29 Sep 2017 14:51:55 +0800 Subject: [PATCH 2/2] rename test file name --- .../k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD | 2 +- .../{encryptionconfig_test.go => config_test.go} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/{encryptionconfig_test.go => config_test.go} (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD index 442550bb97f..2d6d5cf3262 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD @@ -27,7 +27,7 @@ go_library( go_test( name = "go_default_test", - srcs = ["encryptionconfig_test.go"], + srcs = ["config_test.go"], library = ":go_default_library", deps = [ "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/encryptionconfig_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/encryptionconfig_test.go rename to staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go