Add Google Cloud KMS plugin for encryption
This commit is contained in:
parent
6a4afc897c
commit
3e11baf702
@ -1410,6 +1410,10 @@ function start-kube-apiserver {
|
|||||||
|
|
||||||
if [[ -n "${ENCRYPTION_PROVIDER_CONFIG:-}" ]]; then
|
if [[ -n "${ENCRYPTION_PROVIDER_CONFIG:-}" ]]; then
|
||||||
local encryption_provider_config_path="/etc/srv/kubernetes/encryption-provider-config.yml"
|
local encryption_provider_config_path="/etc/srv/kubernetes/encryption-provider-config.yml"
|
||||||
|
if [[ -n "${GOOGLE_CLOUD_KMS_CONFIG_FILE_NAME:-}" && -n "${GOOGLE_CLOUD_KMS_CONFIG:-}" ]]; then
|
||||||
|
echo "${GOOGLE_CLOUD_KMS_CONFIG}" | base64 --decode > "${GOOGLE_CLOUD_KMS_CONFIG_FILE_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "${ENCRYPTION_PROVIDER_CONFIG}" | base64 --decode > "${encryption_provider_config_path}"
|
echo "${ENCRYPTION_PROVIDER_CONFIG}" | base64 --decode > "${encryption_provider_config_path}"
|
||||||
params+=" --experimental-encryption-provider-config=${encryption_provider_config_path}"
|
params+=" --experimental-encryption-provider-config=${encryption_provider_config_path}"
|
||||||
fi
|
fi
|
||||||
|
@ -37,6 +37,7 @@ go_library(
|
|||||||
"gce_urlmap.go",
|
"gce_urlmap.go",
|
||||||
"gce_util.go",
|
"gce_util.go",
|
||||||
"gce_zones.go",
|
"gce_zones.go",
|
||||||
|
"kms.go",
|
||||||
"metrics.go",
|
"metrics.go",
|
||||||
"token_source.go",
|
"token_source.go",
|
||||||
],
|
],
|
||||||
@ -70,6 +71,8 @@ go_library(
|
|||||||
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
|
||||||
|
"//vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig:go_default_library",
|
||||||
|
"//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope:go_default_library",
|
||||||
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
|
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
|
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
|
||||||
"//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
|
"//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
|
||||||
|
@ -31,6 +31,8 @@ import (
|
|||||||
|
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
|
"k8s.io/apiserver/pkg/server/options/encryptionconfig"
|
||||||
|
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope"
|
||||||
"k8s.io/client-go/util/flowcontrol"
|
"k8s.io/client-go/util/flowcontrol"
|
||||||
"k8s.io/kubernetes/pkg/cloudprovider"
|
"k8s.io/kubernetes/pkg/cloudprovider"
|
||||||
"k8s.io/kubernetes/pkg/controller"
|
"k8s.io/kubernetes/pkg/controller"
|
||||||
@ -189,6 +191,10 @@ type CloudConfig struct {
|
|||||||
AlphaFeatureGate *AlphaFeatureGate
|
AlphaFeatureGate *AlphaFeatureGate
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// kmsPluginRegisterOnce prevents the cloudprovider from registering its KMS plugin
|
||||||
|
// more than once in the KMS plugin registry.
|
||||||
|
var kmsPluginRegisterOnce sync.Once
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
cloudprovider.RegisterCloudProvider(
|
cloudprovider.RegisterCloudProvider(
|
||||||
ProviderName,
|
ProviderName,
|
||||||
@ -434,6 +440,15 @@ func CreateGCECloud(config *CloudConfig) (*GCECloud, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gce.manager = &GCEServiceManager{gce}
|
gce.manager = &GCEServiceManager{gce}
|
||||||
|
|
||||||
|
// Registering the KMS plugin only the first time.
|
||||||
|
kmsPluginRegisterOnce.Do(func() {
|
||||||
|
// Register the Google Cloud KMS based service in the KMS plugin registry.
|
||||||
|
encryptionconfig.KMSPluginRegistry.Register(KMSServiceName, func(config io.Reader) (envelope.Service, error) {
|
||||||
|
return gce.getGCPCloudKMSService(config)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
return gce, nil
|
return gce, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
167
pkg/cloudprovider/providers/gce/kms.go
Normal file
167
pkg/cloudprovider/providers/gce/kms.go
Normal file
@ -0,0 +1,167 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2017 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package gce
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
|
||||||
|
"github.com/golang/glog"
|
||||||
|
cloudkms "google.golang.org/api/cloudkms/v1"
|
||||||
|
"google.golang.org/api/googleapi"
|
||||||
|
gcfg "gopkg.in/gcfg.v1"
|
||||||
|
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// KMSServiceName is the name of the cloudkms provider registered by this cloud.
|
||||||
|
KMSServiceName = "gcp-cloudkms"
|
||||||
|
|
||||||
|
defaultGKMSKeyRing = "google-container-engine"
|
||||||
|
defaultGKMSKeyRingLocation = "global"
|
||||||
|
)
|
||||||
|
|
||||||
|
// gkmsConfig contains the GCE specific KMS configuration for setting up a KMS connection.
|
||||||
|
type gkmsConfig struct {
|
||||||
|
Global struct {
|
||||||
|
// location is the KMS location of the KeyRing to be used for encryption.
|
||||||
|
// It can be found by checking the available KeyRings in the IAM UI.
|
||||||
|
// This is not the same as the GCP location of the project.
|
||||||
|
// +optional
|
||||||
|
Location string `gcfg:"kms-location"`
|
||||||
|
// keyRing is the keyRing of the hosted key to be used. The default value is "google-kubernetes".
|
||||||
|
// +optional
|
||||||
|
KeyRing string `gcfg:"kms-keyring"`
|
||||||
|
// cryptoKey is the name of the key to be used for encryption of Data-Encryption-Keys.
|
||||||
|
CryptoKey string `gcfg:"kms-cryptokey"`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// readGCPCloudKMSConfig parses and returns the configuration parameters for Google Cloud KMS.
|
||||||
|
func readGCPCloudKMSConfig(reader io.Reader) (*gkmsConfig, error) {
|
||||||
|
cfg := &gkmsConfig{}
|
||||||
|
if err := gcfg.FatalOnly(gcfg.ReadInto(cfg, reader)); err != nil {
|
||||||
|
glog.Errorf("Couldn't read Google Cloud KMS config: %v", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// gkmsService provides Encrypt and Decrypt methods which allow cryptographic operations
|
||||||
|
// using Google Cloud KMS service.
|
||||||
|
type gkmsService struct {
|
||||||
|
parentName string
|
||||||
|
cloudkmsService *cloudkms.Service
|
||||||
|
}
|
||||||
|
|
||||||
|
// getGCPCloudKMSService provides a Google Cloud KMS based implementation of envelope.Service.
|
||||||
|
func (gce *GCECloud) getGCPCloudKMSService(config io.Reader) (envelope.Service, error) {
|
||||||
|
kmsConfig, err := readGCPCloudKMSConfig(config)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hosting on GCE/GKE with Google KMS encryption provider
|
||||||
|
cloudkmsService := gce.GetKMSService()
|
||||||
|
|
||||||
|
// Set defaults for location and keyRing.
|
||||||
|
location := kmsConfig.Global.Location
|
||||||
|
if len(location) == 0 {
|
||||||
|
location = defaultGKMSKeyRingLocation
|
||||||
|
}
|
||||||
|
keyRing := kmsConfig.Global.KeyRing
|
||||||
|
if len(keyRing) == 0 {
|
||||||
|
keyRing = defaultGKMSKeyRing
|
||||||
|
}
|
||||||
|
|
||||||
|
cryptoKey := kmsConfig.Global.CryptoKey
|
||||||
|
if len(cryptoKey) == 0 {
|
||||||
|
return nil, fmt.Errorf("missing cryptoKey for cloudprovided KMS: " + KMSServiceName)
|
||||||
|
}
|
||||||
|
|
||||||
|
parentName := fmt.Sprintf("projects/%s/locations/%s", gce.projectID, location)
|
||||||
|
|
||||||
|
// Create the keyRing if it does not exist yet
|
||||||
|
_, err = cloudkmsService.Projects.Locations.KeyRings.Create(parentName,
|
||||||
|
&cloudkms.KeyRing{}).KeyRingId(keyRing).Do()
|
||||||
|
if err != nil && unrecoverableCreationError(err) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
parentName = parentName + "/keyRings/" + keyRing
|
||||||
|
|
||||||
|
// Create the cryptoKey if it does not exist yet
|
||||||
|
_, err = cloudkmsService.Projects.Locations.KeyRings.CryptoKeys.Create(parentName,
|
||||||
|
&cloudkms.CryptoKey{
|
||||||
|
Purpose: "ENCRYPT_DECRYPT",
|
||||||
|
}).CryptoKeyId(cryptoKey).Do()
|
||||||
|
if err != nil && unrecoverableCreationError(err) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
parentName = parentName + "/cryptoKeys/" + cryptoKey
|
||||||
|
|
||||||
|
service := &gkmsService{
|
||||||
|
parentName: parentName,
|
||||||
|
cloudkmsService: cloudkmsService,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sanity check before startup. For non-GCP clusters, the user's account may not have permissions to create
|
||||||
|
// the key. We need to verify the existence of the key before apiserver startup.
|
||||||
|
_, err = service.Encrypt([]byte("test"))
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to encrypt data using Google cloudkms, using key %s. Ensure that the keyRing and cryptoKey exist. Got error: %v", parentName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return service, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decrypt decrypts a base64 representation of encrypted bytes.
|
||||||
|
func (t *gkmsService) Decrypt(data string) ([]byte, error) {
|
||||||
|
resp, err := t.cloudkmsService.Projects.Locations.KeyRings.CryptoKeys.
|
||||||
|
Decrypt(t.parentName, &cloudkms.DecryptRequest{
|
||||||
|
Ciphertext: data,
|
||||||
|
}).Do()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return base64.StdEncoding.DecodeString(resp.Plaintext)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Encrypt encrypts bytes, and returns base64 representation of the ciphertext.
|
||||||
|
func (t *gkmsService) Encrypt(data []byte) (string, error) {
|
||||||
|
resp, err := t.cloudkmsService.Projects.Locations.KeyRings.CryptoKeys.
|
||||||
|
Encrypt(t.parentName, &cloudkms.EncryptRequest{
|
||||||
|
Plaintext: base64.StdEncoding.EncodeToString(data),
|
||||||
|
}).Do()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return resp.Ciphertext, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// unrecoverableCreationError decides if Kubernetes should ignore the encountered Google KMS
|
||||||
|
// error. Only to be used for errors seen while creating a KeyRing or CryptoKey.
|
||||||
|
func unrecoverableCreationError(err error) bool {
|
||||||
|
apiError, isAPIError := err.(*googleapi.Error)
|
||||||
|
// 409 means the object exists.
|
||||||
|
// 403 means we do not have permission to create the object, the user must do it.
|
||||||
|
// Else, it is an unrecoverable error.
|
||||||
|
if !isAPIError || (apiError.Code != 409 && apiError.Code != 403) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user