Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
fc8ff61e
Commit
fc8ff61e
authored
Feb 22, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kms: rename KMSService to KeyManagmentService
KMSService is redundent.
parent
da564ef4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
grpc_service.go
...server/pkg/storage/value/encrypt/envelope/grpc_service.go
+3
-3
grpc_service_unix_test.go
.../storage/value/encrypt/envelope/grpc_service_unix_test.go
+1
-1
service.pb.go
.../pkg/storage/value/encrypt/envelope/v1beta1/service.pb.go
+0
-0
service.proto
.../pkg/storage/value/encrypt/envelope/v1beta1/service.proto
+1
-1
No files found.
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
View file @
fc8ff61e
...
...
@@ -46,7 +46,7 @@ const (
// The gRPC implementation for envelope.Service.
type
gRPCService
struct
{
// gRPC client instance
kmsClient
kmsapi
.
K
MS
ServiceClient
kmsClient
kmsapi
.
K
eyManagement
ServiceClient
connection
*
grpc
.
ClientConn
}
...
...
@@ -64,7 +64,7 @@ func NewGRPCService(endpoint string) (Service, error) {
return
nil
,
fmt
.
Errorf
(
"connect remote KMS provider %q failed, error: %v"
,
addr
,
err
)
}
kmsClient
:=
kmsapi
.
NewK
MS
ServiceClient
(
connection
)
kmsClient
:=
kmsapi
.
NewK
eyManagement
ServiceClient
(
connection
)
err
=
checkAPIVersion
(
kmsClient
)
if
err
!=
nil
{
...
...
@@ -99,7 +99,7 @@ func parseEndpoint(endpoint string) (string, error) {
// Check the KMS provider API version.
// Only matching kmsapiVersion is supported now.
func
checkAPIVersion
(
kmsClient
kmsapi
.
K
MS
ServiceClient
)
error
{
func
checkAPIVersion
(
kmsClient
kmsapi
.
K
eyManagement
ServiceClient
)
error
{
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
timeout
)
defer
cancel
()
...
...
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go
View file @
fc8ff61e
...
...
@@ -124,7 +124,7 @@ func startTestKMSProvider() (*grpc.Server, error) {
}
server
:=
grpc
.
NewServer
()
kmsapi
.
RegisterK
MS
ServiceServer
(
server
,
&
base64Server
{})
kmsapi
.
RegisterK
eyManagement
ServiceServer
(
server
,
&
base64Server
{})
go
server
.
Serve
(
listener
)
return
server
,
nil
}
...
...
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/service.pb.go
View file @
fc8ff61e
This diff is collapsed.
Click to expand it.
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/service.proto
View file @
fc8ff61e
...
...
@@ -4,7 +4,7 @@ syntax = "proto3";
package
v1beta1
;
// This service defines the public APIs for remote KMS provider.
service
K
MS
Service
{
service
K
eyManagement
Service
{
// Version returns the runtime name and runtime version of the KMS provider.
rpc
Version
(
VersionRequest
)
returns
(
VersionResponse
)
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment