github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

[KMSv2] restructure kms staging dir

Browse Source 
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
This commit is contained in:
Anish Ramasekar 2023-02-21 19:49:09 +00:00
parent 33c1a542fb
commit c9b8ad6a55
No known key found for this signature in database
GPG Key ID: F1F7F3518F1ECB0C
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
View File

@ -51,7 +51,7 @@ import (
"k8s.io/apiserver/pkg/storage/value/encrypt/secretbox" "k8s.io/apiserver/pkg/storage/value/encrypt/secretbox"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2" "k8s.io/klog/v2"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
) )
const ( const (

2
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
View File

@ -40,7 +40,7 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
"k8s.io/component-base/metrics/testutil" "k8s.io/component-base/metrics/testutil"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
) )
const ( const (

2
staging/src/k8s.io/apiserver/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" kmstypes "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics"
"k8s.io/klog/v2" "k8s.io/klog/v2"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
"k8s.io/utils/clock" "k8s.io/utils/clock"
) )

2
staging/src/k8s.io/apiserver/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/apiserver/pkg/storage/value/encrypt/envelope/metrics"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
"k8s.io/component-base/metrics/testutil" "k8s.io/component-base/metrics/testutil"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
testingclock "k8s.io/utils/clock/testing" testingclock "k8s.io/utils/clock/testing"
) )

2
staging/src/k8s.io/apiserver/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/apiserver/pkg/storage/value/encrypt/envelope/util"
"k8s.io/klog/v2" "k8s.io/klog/v2"
kmsapi "k8s.io/kms/apis/v2alpha1" kmsapi "k8s.io/kms/apis/v2alpha1"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
) )
const ( const (

2
staging/src/k8s.io/apiserver/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/component-base/metrics/testutil"
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
kmsservice "k8s.io/kms/service" kmsservice "k8s.io/kms/pkg/service"
) )
const ( const (

4
staging/src/k8s.io/kms/encryption/service.go → staging/src/k8s.io/kms/pkg/hierarchy/hierarchy.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package encryption package hierarchy
import ( import (
"bytes" "bytes"
@ -32,8 +32,8 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2" "k8s.io/klog/v2"
aestransformer "k8s.io/kms/pkg/encrypt/aes" aestransformer "k8s.io/kms/pkg/encrypt/aes"
"k8s.io/kms/pkg/service"
"k8s.io/kms/pkg/value" "k8s.io/kms/pkg/value"
"k8s.io/kms/service"
"k8s.io/utils/clock" "k8s.io/utils/clock"
"k8s.io/utils/lru" "k8s.io/utils/lru"
) )

4
staging/src/k8s.io/kms/encryption/service_test.go → staging/src/k8s.io/kms/pkg/hierarchy/hierarchy_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package encryption package hierarchy
import ( import (
"bytes" "bytes"
@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/rand"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kms/service" "k8s.io/kms/pkg/service"
testingclock "k8s.io/utils/clock/testing" testingclock "k8s.io/utils/clock/testing"
) )

6
staging/src/k8s.io/kms/service/grpc_service.go → staging/src/k8s.io/kms/pkg/service/grpc_service.go
View File

@ -27,7 +27,7 @@ import (
kmsapi "k8s.io/kms/apis/v2alpha1" kmsapi "k8s.io/kms/apis/v2alpha1"
) )
// GRPCService is a gprc server that runs the kms v2 alpha 1 API. // GRPCService is a grpc server that runs the kms v2 alpha1 API.
type GRPCService struct { type GRPCService struct {
addr string addr string
timeout time.Duration timeout time.Duration
@ -74,8 +74,8 @@ func (s *GRPCService) ListenAndServe() error {
return gs.Serve(ln) return gs.Serve(ln)
} }
// Shutdown performs a grafecul shutdown. Doesn't accept new connections and // Shutdown performs a graceful shutdown. Doesn't accept new connections and
// blocks until all pending RPCs are finished. // blocks until all pending RPCs are finished.
func (s *GRPCService) Shutdown() { func (s *GRPCService) Shutdown() {
klog.V(4).InfoS("kms plugin shutdown", "address", s.addr) klog.V(4).InfoS("kms plugin shutdown", "address", s.addr)
if s.server != nil { if s.server != nil {

0
staging/src/k8s.io/kms/service/grpc_service_test.go → staging/src/k8s.io/kms/pkg/service/grpc_service_test.go
View File

0
staging/src/k8s.io/kms/service/interface.go → staging/src/k8s.io/kms/pkg/service/interface.go
View File

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

@ -47,7 +47,7 @@ import (
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
kmsv2api "k8s.io/kms/apis/v2alpha1" kmsv2api "k8s.io/kms/apis/v2alpha1"
kmsv2svc "k8s.io/kms/service" kmsv2svc "k8s.io/kms/pkg/service"
"k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/etcd"
) )

2
vendor/modules.txt vendored
View File

@ -2107,7 +2107,7 @@ k8s.io/klog/v2/test
## explicit; go 1.19 ## explicit; go 1.19
k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v1beta1
k8s.io/kms/apis/v2alpha1 k8s.io/kms/apis/v2alpha1
k8s.io/kms/service k8s.io/kms/pkg/service
# k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator # k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator
## explicit; go 1.19 ## explicit; go 1.19
k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration