add support for Encryption Providers

kubermatic · Feb 8, 2021 · e35197f · e35197f
1 parent 222201d
commit e35197f
Show file tree

Hide file tree

Showing 29 changed files with 949 additions and 91 deletions.
diff --git a/docs/api_reference/v1beta1.en.md b/docs/api_reference/v1beta1.en.md
@@ -1,6 +1,6 @@
 +++
 title = "v1beta1 API Reference"
-date = 2020-12-08T12:31:41+02:00
+date = 2021-01-17T17:46:19+01:00
 weight = 11
 +++
 ## v1beta1
@@ -23,6 +23,7 @@ weight = 11
 * [DigitalOceanSpec](#digitaloceanspec)
 * [DynamicAuditLog](#dynamicauditlog)
 * [DynamicWorkerConfig](#dynamicworkerconfig)
+* [EncryptionProviders](#encryptionproviders)
 * [ExternalCNISpec](#externalcnispec)
 * [Features](#features)
 * [GCESpec](#gcespec)
@@ -261,6 +262,16 @@ DynamicWorkerConfig describes a set of worker machines
 
 [Back to Group](#v1beta1)
 
+### EncryptionProviders
+
+Encryption Providers feature flag
+
+| Field | Description | Scheme | Required |
+| ----- | ----------- | ------ | -------- |
+| enable | Enable | bool | true |
+
+[Back to Group](#v1beta1)
+
 ### ExternalCNISpec
 
 ExternalCNISpec defines the external CNI plugin.
@@ -284,6 +295,7 @@ Features controls what features will be enabled on the cluster
 | dynamicAuditLog | DynamicAuditLog | *[DynamicAuditLog](#dynamicauditlog) | false |
 | metricsServer | MetricsServer | *[MetricsServer](#metricsserver) | false |
 | openidConnect | OpenIDConnect | *[OpenIDConnect](#openidconnect) | false |
+| encryptionProviders | Encryption Providers | *[EncryptionProviders](#encryptionproviders) | false |
 
 [Back to Group](#v1beta1)
 

diff --git a/go.mod b/go.mod
@@ -30,6 +30,7 @@ require (
 	k8s.io/api v0.18.6
 	k8s.io/apiextensions-apiserver v0.18.6
 	k8s.io/apimachinery v0.18.6
+	k8s.io/apiserver v0.18.6
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/cluster-bootstrap v0.18.6
 	k8s.io/code-generator v0.18.6

diff --git a/go.sum b/go.sum
@@ -896,6 +896,7 @@ k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag=
 k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
 k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg=
 k8s.io/apiserver v0.16.4/go.mod h1:kbLJOak655g6W7C+muqu1F76u9wnEycfKMqbVaXIdAc=
+k8s.io/apiserver v0.18.6 h1:HcWwcOfhj4Yv6y2igP4ZUuovyPjVLGoZcG0Tsph4Mxo=
 k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg=
 k8s.io/client-go v0.18.6 h1:I+oWqJbibLSGsZj8Xs8F0aWVXJVIoUHWaaJV3kUN/Zw=
 k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=

diff --git a/pkg/apis/kubeone/types.go b/pkg/apis/kubeone/types.go
@@ -363,6 +363,8 @@ type Features struct {
 	MetricsServer *MetricsServer `json:"metricsServer,omitempty"`
 	// OpenIDConnect
 	OpenIDConnect *OpenIDConnect `json:"openidConnect,omitempty"`
+	// Encryption Providers
+	EncryptionProviders *EncryptionProviders `json:"encryptionProviders,omitempty"`
 }
 
 // SystemPackages controls configurations of APT/YUM
@@ -568,3 +570,11 @@ type Addons struct {
 	// Path on the local file system to the directory with addons manifests.
 	Path string `json:"path"`
 }
+
+// Encryption Providers feature flag
+type EncryptionProviders struct {
+	// Enable
+	Enable bool `json:"enable"`
+	// CustomProvidersFile
+	CustomProvidersFile string `json:"customProvidersFile"`
+}
diff --git a/pkg/apis/kubeone/v1alpha1/types.go b/pkg/apis/kubeone/v1alpha1/types.go
@@ -217,12 +217,13 @@ type MachineControllerConfig struct {
 type Features struct {
 	PodNodeSelector *PodNodeSelector `json:"podNodeSelector"`
 	// Deprecated: will be removed once Kubernetes 1.19 reaches EOL
-	PodPresets        *PodPresets        `json:"podPresets"`
-	PodSecurityPolicy *PodSecurityPolicy `json:"podSecurityPolicy"`
-	StaticAuditLog    *StaticAuditLog    `json:"staticAuditLog"`
-	DynamicAuditLog   *DynamicAuditLog   `json:"dynamicAuditLog"`
-	MetricsServer     *MetricsServer     `json:"metricsServer"`
-	OpenIDConnect     *OpenIDConnect     `json:"openidConnect"`
+	PodPresets          *PodPresets          `json:"podPresets"`
+	PodSecurityPolicy   *PodSecurityPolicy   `json:"podSecurityPolicy"`
+	StaticAuditLog      *StaticAuditLog      `json:"staticAuditLog"`
+	DynamicAuditLog     *DynamicAuditLog     `json:"dynamicAuditLog"`
+	MetricsServer       *MetricsServer       `json:"metricsServer"`
+	OpenIDConnect       *OpenIDConnect       `json:"openidConnect"`
+	EncryptionProviders *EncryptionProviders `json:"encryptionProviders,omitempty"`
 }
 
 // SystemPackages controls configurations of APT/YUM
@@ -322,3 +323,11 @@ type Addons struct {
 	// Path on the local file system to the directory with addons manifests.
 	Path string `json:"path"`
 }
+
+// Encryption Providers feature flag
+type EncryptionProviders struct {
+	// Enable
+	Enable bool `json:"enable"`
+	// CustomProvidersFile
+	CustomProvidersFile string `json:"customProvidersFile"`
+}
diff --git a/pkg/apis/kubeone/v1alpha1/zz_generated.conversion.go b/pkg/apis/kubeone/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kubeone/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kubeone/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/kubeone/v1beta1/types.go b/pkg/apis/kubeone/v1beta1/types.go
@@ -363,6 +363,8 @@ type Features struct {
 	MetricsServer *MetricsServer `json:"metricsServer,omitempty"`
 	// OpenIDConnect
 	OpenIDConnect *OpenIDConnect `json:"openidConnect,omitempty"`
+	// Encryption Providers
+	EncryptionProviders *EncryptionProviders `json:"encryptionProviders,omitempty"`
 }
 
 // SystemPackages controls configurations of APT/YUM
@@ -568,3 +570,11 @@ type Addons struct {
 	// Path on the local file system to the directory with addons manifests.
 	Path string `json:"path"`
 }
+
+// Encryption Providers feature flag
+type EncryptionProviders struct {
+	// Enable
+	Enable bool `json:"enable"`
+	// CustomProvidersFile
+	CustomProvidersFile string `json:"customProvidersFile"`
+}
diff --git a/pkg/apis/kubeone/v1beta1/zz_generated.conversion.go b/pkg/apis/kubeone/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/kubeone/v1beta1/zz_generated.deepcopy.go b/pkg/apis/kubeone/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/apis/kubeone/zz_generated.deepcopy.go b/pkg/apis/kubeone/zz_generated.deepcopy.go