github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for review comments

Browse Source
This commit is contained in:
Wu Qiang 2018-01-25 05:39:48 +00:00
parent a6368bb04c
commit 2e7af38d6b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/types.go
View File

@ -82,7 +82,9 @@ type KMSConfig struct {
// +optional // +optional
CacheSize int `json:"cachesize,omitempty"` CacheSize int `json:"cachesize,omitempty"`
// configfile is the path to the configuration file for the named KMS provider. // 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". // the gRPC server listening address, for example "unix:///var/run/kms-provider.sock".
Endpoint string `json:"endpoint"` // +optional
Endpoint string `json:"endpoint,omitempty"`
} }

4
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
View File

@ -49,7 +49,7 @@ type gRPCService struct {
// NewGRPCService returns an envelope.Service which use gRPC to communicate the remote KMS provider. // NewGRPCService returns an envelope.Service which use gRPC to communicate the remote KMS provider.
func NewGRPCService(endpoint string) (Service, error) { 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) protocol, addr, err := parseEndpoint(endpoint)
if err != nil { if err != nil {
@ -106,7 +106,7 @@ func checkAPIVersion(kmsClient kmsapi.KMSServiceClient) error {
response.Version, kmsapiVersion) 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 return nil
} }