Merge pull request #94 from stoyanr/add-etcd-backup-controlplane-webh…

…ooks

Implement customizing of etcd stateful sets via webhooks for AWS and GCP

controllers/provider-aws/charts/images.yaml

@@ -10,3 +10,7 @@ images:
   sourceRepository: github.com/gardener/machine-controller-manager
   repository: eu.gcr.io/gardener-project/gardener/machine-controller-manager
   tag: "0.18.0"
+- name: etcd-backup-restore
+  sourceRepository: github.com/gardener/etcd-backup-restore
+  repository: eu.gcr.io/gardener-project/gardener/etcdbrctl
+  tag: "0.6.3"

controllers/provider-aws/charts/provider-aws/templates/configmap.yaml

@@ -15,3 +15,9 @@ data:
     machineImages:
 {{ toYaml .Values.config.machineImages | indent 4 }}
 {{- end }}
+    etcd:
+      storage:
+        className: {{ .Values.config.etcd.storage.className }}
+        capacity: {{ .Values.config.etcd.storage.capacity }}
+      backup:
+        schedule: {{ .Values.config.etcd.backup.schedule }}

controllers/provider-aws/charts/provider-aws/templates/storageclass.yaml

@@ -0,0 +1,8 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .Values.config.etcd.storage.className }}
+provisioner: kubernetes.io/aws-ebs
+allowVolumeExpansion: true
+parameters:
+  type: gp2

controllers/provider-aws/charts/provider-aws/values.yaml

@@ -19,6 +19,7 @@ disableControllers:
 disableWebhooks:
 - controlplane
 - controlplaneexposure
+- controlplanebackup
 
 config:
   machineImages:
@@ -37,3 +38,9 @@ config:
       ami: ami-07739b17529e8c1d0
     - name: ap-southeast-2
       ami: ami-02d7d488d701a460e
+  etcd:
+    storage:
+      className: gardener.cloud-fast
+      capacity: 80Gi
+    backup:
+      schedule: "0 */24 * * *"

controllers/provider-aws/cmd/gardener-extension-provider-aws/app/app.go

@@ -25,6 +25,8 @@ import (
 	awscontrolplane "github.com/gardener/gardener-extensions/controllers/provider-aws/pkg/controller/controlplane"
 	awsinfrastructure "github.com/gardener/gardener-extensions/controllers/provider-aws/pkg/controller/infrastructure"
 	awsworker "github.com/gardener/gardener-extensions/controllers/provider-aws/pkg/controller/worker"
+	awscontrolplanebackup "github.com/gardener/gardener-extensions/controllers/provider-aws/pkg/webhook/controlplanebackup"
+	awscontrolplaneexposure "github.com/gardener/gardener-extensions/controllers/provider-aws/pkg/webhook/controlplaneexposure"
 	"github.com/gardener/gardener-extensions/pkg/controller"
 	controllercmd "github.com/gardener/gardener-extensions/pkg/controller/cmd"
 	"github.com/gardener/gardener-extensions/pkg/controller/infrastructure"
@@ -64,8 +66,18 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			MaxConcurrentReconciles: 5,
 		}
 
-		controllerSwitches = awscmd.ControllerSwitchOptions()
-		webhookSwitches    = awscmd.WebhookAddToManagerOptions()
+		controllerSwitches   = awscmd.ControllerSwitchOptions()
+		webhookSwitches      = awscmd.WebhookSwitchOptions()
+		webhookServerOptions = &webhookcmd.ServerOptions{
+			Port:             7890,
+			CertDir:          "/tmp/cert",
+			Mode:             webhookcmd.ServiceMode,
+			Name:             "webhooks",
+			Namespace:        os.Getenv("WEBHOOK_CONFIG_NAMESPACE"),
+			ServiceSelectors: "{}",
+			Host:             "localhost",
+		}
+		webhookOptions = webhookcmd.NewAddToManagerOptions("aws-webhooks", webhookServerOptions, webhookSwitches)
 
 		aggOption = controllercmd.NewOptionAggregator(
 			restOpts,
@@ -75,20 +87,10 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			controllercmd.PrefixOption("worker-", workerCtrlOpts),
 			configFileOpts,
 			controllerSwitches,
-			webhookSwitches,
+			webhookOptions,
 		)
 	)
 
-	webhookSwitches.Server = webhookcmd.ServerOptions{
-		Port:             7890,
-		CertDir:          "/tmp/cert",
-		Mode:             webhookcmd.ServiceMode,
-		Name:             "webhooks",
-		Namespace:        os.Getenv("WEBHOOK_CONFIG_NAMESPACE"),
-		ServiceSelectors: "{}",
-		Host:             "localhost",
-	}
-
 	cmd := &cobra.Command{
 		Use: fmt.Sprintf("%s-controller-manager", aws.Name),
 
@@ -111,6 +113,8 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			}
 
 			configFileOpts.Completed().ApplyMachineImages(&awsworker.DefaultAddOptions.MachineImagesToAMIMapping)
+			configFileOpts.Completed().ApplyETCDStorage(&awscontrolplaneexposure.DefaultAddOptions.ETCDStorage)
+			configFileOpts.Completed().ApplyETCDBackup(&awscontrolplanebackup.DefaultAddOptions.ETCDBackup)
 			controlPlaneCtrlOpts.Completed().Apply(&awscontrolplane.Options)
 			infraCtrlOpts.Completed().Apply(&awsinfrastructure.DefaultAddOptions.Controller)
 			infraReconcileOpts.Completed().Apply(&awsinfrastructure.DefaultAddOptions.IgnoreOperationAnnotation)
@@ -120,7 +124,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 				controllercmd.LogErrAndExit(err, "Could not add controllers to manager")
 			}
 
-			if err := webhookSwitches.Completed().AddToManager(mgr); err != nil {
+			if err := webhookOptions.Completed().AddToManager(mgr); err != nil {
 				controllercmd.LogErrAndExit(err, "Could not add webhooks to manager")
 			}
 

controllers/provider-aws/example/00-componentconfig.yaml

@@ -17,3 +17,9 @@ machineImages:
     ami: ami-07739b17529e8c1d0
   - name: ap-southeast-2
     ami: ami-02d7d488d701a460e
+etcd:
+  storage:
+    className: gardener.cloud-fast
+    capacity: 80Gi
+  backup:
+    schedule: "0 */24 * * *"

controllers/provider-aws/example/30-etcd-backup-secret.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: etcd-backup
+  namespace: shoot--foo--bar
+type: Opaque
+data:
+  bucketName: YnVja2V0MTIz # bucket123
+  region: ZXUtd2VzdC0x # eu-west-1
+  accessKeyID: YWRtaW4= # admin
+  secretAccessKey: YWRtaW4= # admin

controllers/provider-aws/example/controller-registration.yaml

@@ -14,7 +14,7 @@ spec:
   deployment:
     type: helm
     providerConfig:
-      chart: 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
+      chart: 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
       values:
         image:
           tag: 0.7.0-dev

controllers/provider-aws/pkg/apis/config/types.go

@@ -15,6 +15,7 @@
 package config
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -27,6 +28,8 @@ type ControllerConfiguration struct {
 	// MachineImages is the list of machine images that are understood by the controller. It maps
 	// logical names and versions to AWS-specific identifiers, i.e. AMIs.
 	MachineImages []MachineImage
+	// ETCD is the etcd configuration.
+	ETCD ETCD
 }
 
 // MachineImage is a mapping from logical names and versions to AWS-specific identifiers, i.e. AMIs.
@@ -46,3 +49,25 @@ type RegionAMIMapping struct {
 	// AMI is the AMI for the machine image.
 	AMI string
 }
+
+// ETCD is an etcd configuration.
+type ETCD struct {
+	// ETCDStorage is the etcd storage configuration.
+	Storage ETCDStorage
+	// ETCDBackup is the etcd backup configuration.
+	Backup ETCDBackup
+}
+
+// ETCDStorage is an etcd storage configuration.
+type ETCDStorage struct {
+	// ClassName is the name of the storage class used in etcd-main volume claims.
+	ClassName *string
+	// Capacity is the storage capacity used in etcd-main volume claims.
+	Capacity *resource.Quantity
+}
+
+// ETCDBackup is an etcd backup configuration.
+type ETCDBackup struct {
+	// Schedule is the etcd backup schedule.
+	Schedule *string
+}

controllers/provider-aws/pkg/apis/config/v1alpha1/types.go

@@ -15,6 +15,7 @@
 package v1alpha1
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -27,6 +28,8 @@ type ControllerConfiguration struct {
 	// MachineImages is the list of machine images that are understood by the controller. It maps
 	// logical names and versions to AWS-specific identifiers, i.e. AMIs.
 	MachineImages []MachineImage `json:"machineImages,omitempty"`
+	// ETCD is the etcd configuration.
+	ETCD ETCD `json:"etcd"`
 }
 
 // MachineImage is a mapping from logical names and versions to AWS-specific identifiers, i.e. AMIs.
@@ -46,3 +49,28 @@ type RegionAMIMapping struct {
 	// AMI is the AMI for the machine image.
 	AMI string `json:"ami"`
 }
+
+// ETCD is an etcd configuration.
+type ETCD struct {
+	// ETCDStorage is the etcd storage configuration.
+	Storage ETCDStorage `json:"storage"`
+	// ETCDBackup is the etcd backup configuration.
+	Backup ETCDBackup `json:"backup"`
+}
+
+// ETCDStorage is an etcd storage configuration.
+type ETCDStorage struct {
+	// ClassName is the name of the storage class used in etcd-main volume claims.
+	// +optional
+	ClassName *string `json:"className,omitempty"`
+	// Capacity is the storage capacity used in etcd-main volume claims.
+	// +optional
+	Capacity *resource.Quantity `json:"capacity,omitempty"`
+}
+
+// ETCDBackup is an etcd backup configuration.
+type ETCDBackup struct {
+	// Schedule is the etcd backup schedule.
+	// +optional
+	Schedule *string `json:"schedule,omitempty"`
+}