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

[KMSv2] restructure kms staging dir

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

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

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

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

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go

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

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go

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

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go

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

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go

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

staging/src/k8s.io/kms/pkg/hierarchy/hierarchy.go

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

staging/src/k8s.io/kms/pkg/hierarchy/hierarchy_test.go

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

staging/src/k8s.io/kms/pkg/service/grpc_service.go

@@ -27,7 +27,7 @@ import (
 	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 {
 	addr    string
 	timeout time.Duration
@@ -74,8 +74,8 @@ func (s *GRPCService) ListenAndServe() error {
 	return gs.Serve(ln)
 }
 
-// Shutdown performs a grafecul shutdown. Doesn't accept new connections and
-// blocks until all pending  RPCs are finished.
+// Shutdown performs a graceful shutdown. Doesn't accept new connections and
+// blocks until all pending RPCs are finished.
 func (s *GRPCService) Shutdown() {
 	klog.V(4).InfoS("kms plugin shutdown", "address", s.addr)
 	if s.server != nil {