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"`
+}