Clean up cloudprovider webhook after dropping the gardener version ch…

…eck (#823)

pkg/cmd/options.go

@@ -53,7 +53,7 @@ func WebhookSwitchOptions(gardenerVersion *string) *webhookcmd.SwitchOptions {
 	return webhookcmd.NewSwitchOptions(
 		webhookcmd.Switch(extensioncontrolplanewebhook.WebhookName, controlplanewebhook.AddToManager(gardenerVersion)),
 		webhookcmd.Switch(extensioncontrolplanewebhook.ExposureWebhookName, controlplaneexposurewebhook.AddToManager),
-		webhookcmd.Switch(extensionscloudproviderwebhook.WebhookName, cloudproviderwebhook.AddToManager(gardenerVersion)),
+		webhookcmd.Switch(extensionscloudproviderwebhook.WebhookName, cloudproviderwebhook.AddToManager),
 		webhookcmd.Switch(infrastructurewebhook.WebhookName, infrastructurewebhook.AddToManager),
 	)
 }

pkg/webhook/cloudprovider/add.go

@@ -5,34 +5,23 @@
 package cloudprovider
 
 import (
-	"github.com/Masterminds/semver/v3"
 	extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
 	"github.com/gardener/gardener/extensions/pkg/webhook/cloudprovider"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/gardener/gardener-extension-provider-openstack/pkg/openstack"
 )
 
 var (
-	logger                           = log.Log.WithName("openstack-cloudprovider-webhook")
-	versionConstraintGreaterEqual142 *semver.Constraints
+	logger = log.Log.WithName("openstack-cloudprovider-webhook")
 )
 
-func init() {
-	var err error
-	versionConstraintGreaterEqual142, err = semver.NewConstraint(">= 1.42")
-	utilruntime.Must(err)
-}
-
 // AddToManager creates the cloudprovider webhook and adds it to the manager.
-func AddToManager(_ *string) func(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
-	return func(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
-		logger.Info("adding webhook to manager")
-		return cloudprovider.New(mgr, cloudprovider.Args{
-			Provider: openstack.Type,
-			Mutator:  cloudprovider.NewMutator(mgr, logger, NewEnsurer(mgr, logger)),
-		})
-	}
+func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
+	logger.Info("Adding webhook to manager")
+	return cloudprovider.New(mgr, cloudprovider.Args{
+		Provider: openstack.Type,
+		Mutator:  cloudprovider.NewMutator(mgr, logger, NewEnsurer(mgr, logger)),
+	})
 }