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
57e84616
Commit
57e84616
authored
Jun 27, 2017
by
Saksham Sharma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Google cloudkms service to gce cloud provider
parent
b47dc470
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
BUILD
pkg/cloudprovider/providers/gce/BUILD
+1
-0
gce.go
pkg/cloudprovider/providers/gce/gce.go
+20
-2
No files found.
pkg/cloudprovider/providers/gce/BUILD
View file @
57e84616
...
...
@@ -55,6 +55,7 @@ go_library(
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/golang.org/x/oauth2:go_default_library",
"//vendor/golang.org/x/oauth2/google:go_default_library",
"//vendor/google.golang.org/api/cloudkms/v1:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/google.golang.org/api/container/v1:go_default_library",
...
...
pkg/cloudprovider/providers/gce/gce.go
View file @
57e84616
...
...
@@ -25,9 +25,9 @@ import (
"sync"
"time"
"cloud.google.com/go/compute/metadata
"
gcfg
"gopkg.in/gcfg.v1
"
"
gopkg.in/gcfg.v1
"
"
cloud.google.com/go/compute/metadata
"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
...
...
@@ -38,6 +38,7 @@ import (
"github.com/golang/glog"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
cloudkms
"google.golang.org/api/cloudkms/v1"
computebeta
"google.golang.org/api/compute/v0.beta"
compute
"google.golang.org/api/compute/v1"
container
"google.golang.org/api/container/v1"
...
...
@@ -85,6 +86,7 @@ type GCECloud struct {
service
*
compute
.
Service
serviceBeta
*
computebeta
.
Service
containerService
*
container
.
Service
cloudkmsService
*
cloudkms
.
Service
clientBuilder
controller
.
ControllerClientBuilder
projectID
string
region
string
...
...
@@ -153,6 +155,16 @@ func (g *GCECloud) GetComputeService() *compute.Service {
return
g
.
service
}
// Raw access to the cloudkmsService of GCE cloud. Required for encryption of etcd using Google KMS.
func
(
g
*
GCECloud
)
GetKMSService
()
*
cloudkms
.
Service
{
return
g
.
cloudkmsService
}
// Returns the ProjectID corresponding to the project this cloud is in.
func
(
g
*
GCECloud
)
GetProjectID
()
string
{
return
g
.
projectID
}
// newGCECloud creates a new instance of GCECloud.
func
newGCECloud
(
config
io
.
Reader
)
(
*
GCECloud
,
error
)
{
projectID
,
zone
,
err
:=
getProjectAndZone
()
...
...
@@ -244,6 +256,11 @@ func CreateGCECloud(projectID, region, zone string, managedZones []string, netwo
return
nil
,
err
}
cloudkmsService
,
err
:=
cloudkms
.
New
(
client
)
if
err
!=
nil
{
return
nil
,
err
}
if
networkURL
==
""
{
networkName
,
err
:=
getNetworkNameViaAPICall
(
service
,
projectID
)
if
err
!=
nil
{
...
...
@@ -274,6 +291,7 @@ func CreateGCECloud(projectID, region, zone string, managedZones []string, netwo
service
:
service
,
serviceBeta
:
serviceBeta
,
containerService
:
containerService
,
cloudkmsService
:
cloudkmsService
,
projectID
:
projectID
,
networkProjectID
:
networkProjectID
,
onXPN
:
onXPN
,
...
...
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