Add controlplane webhooks for Openstack

Makefile

@@ -144,6 +144,9 @@ start-provider-openstack:
 		--config-file=./controllers/provider-openstack/example/00-componentconfig.yaml \
 		--infrastructure-ignore-operation-annotation=$(IGNORE_OPERATION_ANNOTATION) \
 		--leader-election=$(LEADER_ELECTION) \
+		--webhook-config-mode=url \
+		--webhook-config-name=openstack-webhooks \
+		--webhook-config-host=$(HOSTNAME)
 
 .PHONY: start-provider-alicloud
 start-provider-alicloud:

controllers/provider-openstack/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-openstack/charts/provider-openstack/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-openstack/charts/provider-openstack/templates/deployment.yaml

@@ -30,10 +30,16 @@ spec:
         - /gardener-extension-hyper
         - provider-openstack-controller-manager
         - --config-file=/etc/gardener-extension-provider-openstack/config/config.yaml
+        - --controlplane-max-concurrent-reconciles={{ .Values.controllers.controlplane.concurrentSyncs }}
         - --infrastructure-max-concurrent-reconciles={{ .Values.controllers.infrastructure.concurrentSyncs }}
         - --infrastructure-ignore-operation-annotation={{ .Values.controllers.infrastructure.ignoreOperationAnnotation }}
         - --worker-max-concurrent-reconciles={{ .Values.controllers.worker.concurrentSyncs }}
+        - --webhook-config-mode=service
+        - --webhook-config-name=openstack-webhooks
+        - --webhook-config-namespace={{ .Release.Namespace }}
+        - --webhook-config-service-selectors={"app.kubernetes.io/name":"gardener-extension-provider-openstack","app.kubernetes.io/instance":"{{ .Release.Name }}"}
         - --disable-controllers={{ .Values.disableControllers | join "," }}
+        - --disable-webhooks={{ .Values.disableWebhooks | join "," }}
         env:
         - name: LEADER_ELECTION_NAMESPACE
           valueFrom:
@@ -44,6 +50,10 @@ spec:
         volumeMounts:
         - name: config
           mountPath: /etc/gardener-extension-provider-openstack/config
+        ports:
+        - name: webhook-server
+          containerPort: 7890
+          protocol: TCP
       volumes:
       - name: config
         configMap:

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

@@ -0,0 +1,7 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+    name: {{ .Values.config.etcd.storage.className }}
+provisioner: kubernetes.io/cinder
+allowVolumeExpansion: true
+parameters: []

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

@@ -6,14 +6,21 @@ image:
 resources: {}
 
 controllers:
+  controlplane:
+    concurrentSyncs: 5
   infrastructure:
     concurrentSyncs: 5
     ignoreOperationAnnotation: false
   worker:
     concurrentSyncs: 5
 
 
-disableControllers: []
+disableControllers:
+  - controlplane-controller
+disableWebhooks:
+  - controlplane
+  - controlplaneexposure
+  - controlplanebackup
 
 config:
   machineImages:
@@ -22,3 +29,9 @@ config:
     cloudProfiles:
     - name: eu-de-1
       image: coreos-2023.5.0
+  etcd:
+    storage:
+      className: gardener.cloud-fast
+      capacity: 25Gi
+    backup:
+      schedule: "0 */24 * * *"

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

@@ -25,10 +25,12 @@ import (
 	openstackinfrastructure "github.com/gardener/gardener-extensions/controllers/provider-openstack/pkg/controller/infrastructure"
 	openstackworker "github.com/gardener/gardener-extensions/controllers/provider-openstack/pkg/controller/worker"
 	"github.com/gardener/gardener-extensions/controllers/provider-openstack/pkg/openstack"
+	openstackcontrolplanebackup "github.com/gardener/gardener-extensions/controllers/provider-openstack/pkg/webhook/controlplanebackup"
+	openstackcontrolplaneexposure "github.com/gardener/gardener-extensions/controllers/provider-openstack/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"
-
+	webhookcmd "github.com/gardener/gardener-extensions/pkg/webhook/cmd"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -63,7 +65,18 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			MaxConcurrentReconciles: 5,
 		}
 
-		controllerSwitches = openstackcmd.ControllerSwitchOptions()
+		controllerSwitches   = openstackcmd.ControllerSwitchOptions()
+		webhookSwitches      = openstackcmd.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("openstack-webhooks", webhookServerOptions, webhookSwitches)
 
 		aggOption = controllercmd.NewOptionAggregator(
 			restOpts,
@@ -72,6 +85,8 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			controllercmd.PrefixOption("infrastructure-", &infraCtrlOptsUnprefixed),
 			controllercmd.PrefixOption("worker-", workerCtrlOpts),
 			controllerSwitches,
+			configFileOpts,
+			webhookOptions,
 		)
 	)
 
@@ -83,10 +98,6 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 				controllercmd.LogErrAndExit(err, "Error completing options")
 			}
 
-			if err := configFileOpts.Complete(); err != nil {
-				controllercmd.LogErrAndExit(err, "Error completing config options")
-			}
-
 			mgr, err := manager.New(restOpts.Completed().Config, mgrOpts.Completed().Options())
 			if err != nil {
 				controllercmd.LogErrAndExit(err, "Could not instantiate manager")
@@ -101,6 +112,8 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 			}
 
 			configFileOpts.Completed().ApplyMachineImages(&openstackworker.DefaultAddOptions.MachineImagesToCloudProfilesMapping)
+			configFileOpts.Completed().ApplyETCDStorage(&openstackcontrolplaneexposure.DefaultAddOptions.ETCDStorage)
+			configFileOpts.Completed().ApplyETCDBackup(&openstackcontrolplanebackup.DefaultAddOptions.ETCDBackup)
 			controlPlaneCtrlOpts.Completed().Apply(&openstackcp.Options)
 			infraCtrlOpts.Completed().Apply(&openstackinfrastructure.DefaultAddOptions.Controller)
 			infraReconcileOpts.Completed().Apply(&openstackinfrastructure.DefaultAddOptions.IgnoreOperationAnnotation)
@@ -110,14 +123,17 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 				controllercmd.LogErrAndExit(err, "Could not add controllers to manager")
 			}
 
+			if err := webhookOptions.Completed().AddToManager(mgr); err != nil {
+				controllercmd.LogErrAndExit(err, "Could not add webhooks to manager")
+			}
+
 			if err := mgr.Start(ctx.Done()); err != nil {
 				controllercmd.LogErrAndExit(err, "Error running manager")
 			}
 		},
 	}
 
 	aggOption.AddFlags(cmd.Flags())
-	configFileOpts.AddFlags(cmd.Flags())
 
 	return cmd
 }

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

@@ -7,3 +7,9 @@ machineImages:
   cloudProfiles:
   - name: eu-de-1
     image: coreos-2023.5.0
+etcd:
+  storage:
+    className: gardener.cloud-fast
+    capacity: 25Gi
+  backup:
+    schedule: "0 */24 * * *"

controllers/provider-openstack/example/30-controlplane.yaml

@@ -1,3 +1,11 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: shoot--foo--bar # shoot--dev--local
+  labels:
+#    backup.gardener.cloud/provider: openstack
+#    seed.gardener.cloud/provider: openstack
+    shoot.gardener.cloud/provider: openstack
 ---
 apiVersion: v1
 kind: Secret

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

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: etcd-backup
+  namespace: shoot--foo--bar
+type: Opaque
+data:
+  bucketName: YnVja2V0MTIz
+  authURL: dGVzdFVSTA==
+  domainName: ZG9tYWluLW9wZW4tc3RhY2s=
+  tenantName: dGVuYW50LW9wZW4tc3RhY2s=
+  username: YWRtaW4=
+  password: YWRtaW4=

controllers/provider-openstack/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-openstack/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,9 @@ type ControllerConfiguration struct {
 	// MachineImages is the list of machine images that are understood by the controller. It maps
 	// logical names and versions to OpenStack-specific identifiers.
 	MachineImages []MachineImage
+
+	// ETCD is the etcd configuration.
+	ETCD ETCD
 }
 
 // MachineImage is a mapping from logical names and versions to OpenStack-specific identifiers.
@@ -46,3 +50,25 @@ type CloudProfileMapping struct {
 	// Image is the name of the image.
 	Image 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-openstack/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,9 @@ type ControllerConfiguration struct {
 	// MachineImages is the list of machine images that are understood by the controller. It maps
 	// logical names and versions to OpenStack-specific identifiers.
 	MachineImages []MachineImage `json:"machineImages,omitempty"`
+
+	// ETCD is the etcd configuration.
+	ETCD ETCD `json:"etcd"`
 }
 
 // MachineImage is a mapping from logical names and versions to OpenStack-specific identifiers.
@@ -46,3 +50,28 @@ type CloudProfileMapping struct {
 	// Image is the name of the image.
 	Image string `json:"image"`
 }
+
+// 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"`
+}