From 2e7af38d6b4c8ed9e1fb23930b98ed8d2ad68aa0 Mon Sep 17 00:00:00 2001 From: Wu Qiang Date: Thu, 25 Jan 2018 05:39:48 +0000 Subject: [PATCH] Update for review comments --- .../apiserver/pkg/server/options/encryptionconfig/types.go | 6 ++++-- .../pkg/storage/value/encrypt/envelope/grpc_service.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/types.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/types.go index 02c604ce272..23b37debe25 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/types.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/types.go @@ -82,7 +82,9 @@ type KMSConfig struct { // +optional CacheSize int `json:"cachesize,omitempty"` // configfile is the path to the configuration file for the named KMS provider. - ConfigFile string `json:"configfile"` + // +optional + ConfigFile string `json:"configfile,omitempty"` // the gRPC server listening address, for example "unix:///var/run/kms-provider.sock". - Endpoint string `json:"endpoint"` + // +optional + Endpoint string `json:"endpoint,omitempty"` } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go index 8d68a23a3ce..cf33ab05d42 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go @@ -49,7 +49,7 @@ type gRPCService struct { // NewGRPCService returns an envelope.Service which use gRPC to communicate the remote KMS provider. func NewGRPCService(endpoint string) (Service, error) { - glog.Infof("Configure KMS provider with endpoint: %s", endpoint) + glog.V(4).Infof("Configure KMS provider with endpoint: %s", endpoint) protocol, addr, err := parseEndpoint(endpoint) if err != nil { @@ -106,7 +106,7 @@ func checkAPIVersion(kmsClient kmsapi.KMSServiceClient) error { response.Version, kmsapiVersion) } - glog.Infof("KMS provider %s initialized, version: %s", response.RuntimeName, response.RuntimeVersion) + glog.V(4).Infof("KMS provider %s initialized, version: %s", response.RuntimeName, response.RuntimeVersion) return nil }