Merge pull request kubernetes#116630 from aramase/aramase/c/rm_key_hierarchy

[KMSv2] remove key hierarchy in reference implementation

Author: k8s-ci-robot

staging/src/k8s.io/kms/go.mod

@@ -10,19 +10,18 @@ require (
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v0.0.0
 	k8s.io/klog/v2 v2.90.1
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 )
 
 require (
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 )
 
 replace (

staging/src/k8s.io/kms/go.sum

@@ -11,15 +11,13 @@ require (
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
 	google.golang.org/grpc v1.51.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
-	k8s.io/apimachinery v0.0.0 // indirect
 	k8s.io/client-go v0.0.0 // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 )

staging/src/k8s.io/kms/internal/plugins/mock/go.mod

@@ -26,7 +26,6 @@ import (
 
 	"k8s.io/klog/v2"
 	"k8s.io/kms/internal"
-	"k8s.io/kms/pkg/hierarchy"
 	"k8s.io/kms/pkg/service"
 	"k8s.io/kms/pkg/util"
 )
@@ -55,14 +54,20 @@ func main() {
 	grpcService := service.NewGRPCService(
 		addr,
 		*timeout,
-		hierarchy.NewLocalKEKService(ctx, remoteKMSService),
+		remoteKMSService,
 	)
 
 	klog.InfoS("starting server", "listenAddr", *listenAddr)
-	if err := grpcService.ListenAndServe(); err != nil {
-		klog.ErrorS(err, "failed to serve")
-		os.Exit(1)
-	}
+	go func() {
+		if err := grpcService.ListenAndServe(); err != nil {
+			klog.ErrorS(err, "failed to serve")
+			os.Exit(1)
+		}
+	}()
+
+	<-ctx.Done()
+	klog.InfoS("shutting down server")
+	grpcService.Shutdown()
 }
 
 // withShutdownSignal returns a copy of the parent context that will close if