Merge pull request kubernetes#120947 from enj/enj/i/kms_drop_klog

k8s.io/kms: drop direct dependency on klog

Author: k8s-ci-robot

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

@@ -8,7 +8,6 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	google.golang.org/grpc v1.55.0
 	k8s.io/apimachinery v0.0.0
-	k8s.io/klog/v2 v2.100.1
 )
 
 require (
@@ -19,6 +18,7 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 )
 

staging/src/k8s.io/kms/internal/plugins/_mock/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.1-bullseye as builder
+FROM golang:1.21.3-bullseye as builder
 
 WORKDIR /workspace
 

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

@@ -4,12 +4,10 @@ go 1.19
 
 require (
 	github.com/ThalesIgnite/crypto11 v1.2.5
-	k8s.io/klog/v2 v2.100.1
 	k8s.io/kms v0.0.0-00010101000000-000000000000
 )
 
 require (
-	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f // indirect
@@ -25,6 +23,5 @@ require (
 
 replace (
 	k8s.io/apimachinery => ../../../../apimachinery
-	k8s.io/client-go => ../../../../client-go
 	k8s.io/kms => ../../../../kms
 )

staging/src/k8s.io/kms/internal/plugins/_mock/go.sum

@@ -24,7 +24,6 @@ import (
 	"syscall"
 	"time"
 
-	"k8s.io/klog/v2"
 	"k8s.io/kms/pkg/service"
 	"k8s.io/kms/pkg/util"
 	"k8s.io/kms/plugins/mock/pkcs11"
@@ -41,14 +40,12 @@ func main() {
 
 	addr, err := util.ParseEndpoint(*listenAddr)
 	if err != nil {
-		klog.ErrorS(err, "failed to parse endpoint")
-		os.Exit(1)
+		panic("failed to parse endpoint: " + err.Error())
 	}
 
 	remoteKMSService, err := pkcs11.NewPKCS11RemoteService(*configFilePath, "kms-test")
 	if err != nil {
-		klog.ErrorS(err, "failed to create remote service")
-		os.Exit(1)
+		panic("failed to create remote service: " + err.Error())
 	}
 
 	ctx := withShutdownSignal(context.Background())
@@ -58,16 +55,13 @@ func main() {
 		remoteKMSService,
 	)
 
-	klog.InfoS("starting server", "listenAddr", *listenAddr)
 	go func() {
 		if err := grpcService.ListenAndServe(); err != nil {
-			klog.ErrorS(err, "failed to serve")
-			os.Exit(1)
+			panic("failed to serve: " + err.Error())
 		}
 	}()
 
 	<-ctx.Done()
-	klog.InfoS("shutting down server")
 	grpcService.Shutdown()
 }
 
@@ -81,7 +75,6 @@ func withShutdownSignal(ctx context.Context) context.Context {
 
 	go func() {
 		<-signalChan
-		klog.InfoS("received shutdown signal")
 		cancel()
 	}()
 	return nctx

staging/src/k8s.io/kms/internal/plugins/_mock/plugin.go

@@ -23,7 +23,6 @@ import (
 
 	"google.golang.org/grpc"
 
-	"k8s.io/klog/v2"
 	kmsapi "k8s.io/kms/apis/v2"
 )
 
@@ -45,8 +44,6 @@ func NewGRPCService(
 
 	kmsService Service,
 ) *GRPCService {
-	klog.V(4).InfoS("KMS plugin configured", "address", address, "timeout", timeout)
-
 	return &GRPCService{
 		addr:       address,
 		timeout:    timeout,
@@ -70,14 +67,12 @@ func (s *GRPCService) ListenAndServe() error {
 
 	kmsapi.RegisterKeyManagementServiceServer(gs, s)
 
-	klog.V(4).InfoS("kms plugin serving", "address", s.addr)
 	return gs.Serve(ln)
 }
 
 // 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 {
 		s.server.GracefulStop()
 	}
@@ -86,7 +81,6 @@ func (s *GRPCService) Shutdown() {
 // Close stops the server by closing all connections immediately and cancels
 // all active RPCs.
 func (s *GRPCService) Close() {
-	klog.V(4).InfoS("kms plugin close", "address", s.addr)
 	if s.server != nil {
 		s.server.Stop()
 	}
@@ -108,8 +102,6 @@ func (s *GRPCService) Status(ctx context.Context, _ *kmsapi.StatusRequest) (*kms
 
 // Decrypt sends a decryption request to specified kms service.
 func (s *GRPCService) Decrypt(ctx context.Context, req *kmsapi.DecryptRequest) (*kmsapi.DecryptResponse, error) {
-	klog.V(4).InfoS("decrypt request received", "id", req.Uid)
-
 	plaintext, err := s.kmsService.Decrypt(ctx, req.Uid, &DecryptRequest{
 		Ciphertext:  req.Ciphertext,
 		KeyID:       req.KeyId,
@@ -126,8 +118,6 @@ func (s *GRPCService) Decrypt(ctx context.Context, req *kmsapi.DecryptRequest) (
 
 // Encrypt sends an encryption request to specified kms service.
 func (s *GRPCService) Encrypt(ctx context.Context, req *kmsapi.EncryptRequest) (*kmsapi.EncryptResponse, error) {
-	klog.V(4).InfoS("encrypt request received", "id", req.Uid)
-
 	encRes, err := s.kmsService.Encrypt(ctx, req.Uid, req.Plaintext)
 	if err != nil {
 		return nil, err