Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add object selector to controlplane webhook with version constraint #905

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/gardener-extension-provider-azure/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
Namespace: os.Getenv("WEBHOOK_CONFIG_NAMESPACE"),
}

gardenerVersion = new(string)
controllerSwitches = azurecmd.ControllerSwitchOptions()
webhookSwitches = azurecmd.WebhookSwitchOptions()
webhookSwitches = azurecmd.WebhookSwitchOptions(gardenerVersion)
webhookOptions = webhookcmd.NewAddToManagerOptions(
azure.Name,
genericactuator.ShootWebhooksResourceName,
Expand Down Expand Up @@ -214,6 +215,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
}

log.Info("Adding controllers to manager")
*gardenerVersion = generalOpts.Completed().GardenerVersion

configFileOpts.Completed().ApplyETCDStorage(&azurecontrolplaneexposure.DefaultAddOptions.ETCDStorage)
configFileOpts.Completed().ApplyHealthCheckConfig(&healthcheck.DefaultAddOptions.HealthCheckConfig)
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ func ControllerSwitchOptions() *controllercmd.SwitchOptions {
}

// WebhookSwitchOptions are the webhookcmd.SwitchOptions for the provider webhooks.
func WebhookSwitchOptions() *webhookcmd.SwitchOptions {
func WebhookSwitchOptions(gardenerVersion *string) *webhookcmd.SwitchOptions {
return webhookcmd.NewSwitchOptions(
webhookcmd.Switch(extensionsnetworkwebhook.WebhookName, networkwebhook.AddToManager),
webhookcmd.Switch(acceleratednetworkwebhook.WebhookName, acceleratednetworkwebhook.AddToManager),
webhookcmd.Switch(infrastructurewebhook.WebhookName, infrastructurewebhook.AddToManager),
webhookcmd.Switch(extensionscontrolplanewebhook.WebhookName, controlplanewebhook.AddToManager),
webhookcmd.Switch(extensionscontrolplanewebhook.WebhookName, controlplanewebhook.AddToManager(gardenerVersion)),
webhookcmd.Switch(extensionscontrolplanewebhook.ExposureWebhookName, controlplaneexposurewebhook.AddToManager),
webhookcmd.Switch(extensionscloudproviderwebhook.WebhookName, cloudproviderwebhook.AddToManager),
webhookcmd.Switch(topology.WebhookName, topology.AddToManager),
Expand Down
56 changes: 42 additions & 14 deletions pkg/webhook/controlplane/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@
package controlplane

import (
"fmt"

"github.com/Masterminds/semver/v3"
extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
"github.com/gardener/gardener/extensions/pkg/webhook/controlplane"
"github.com/gardener/gardener/extensions/pkg/webhook/controlplane/genericmutator"
v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/gardener/gardener/pkg/component/extensions/operatingsystemconfig/original/components/kubelet"
oscutils "github.com/gardener/gardener/pkg/component/extensions/operatingsystemconfig/utils"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
vpaautoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand All @@ -21,21 +27,43 @@ import (

var (
logger = log.Log.WithName("azure-controlplane-webhook")
// TODO(LucaBernstein): Clean up the gardener version check after October/2024.
versionConstraintGreaterEqual198 *semver.Constraints
)

func init() {
var err error
versionConstraintGreaterEqual198, err = semver.NewConstraint(">= 1.98")
LucaBernstein marked this conversation as resolved.
Show resolved Hide resolved
utilruntime.Must(err)
}

// AddToManager creates a webhook and adds it to the manager.
func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
logger.Info("Adding webhook to manager")
fciCodec := oscutils.NewFileContentInlineCodec()
return controlplane.New(mgr, controlplane.Args{
Kind: controlplane.KindShoot,
Provider: azure.Type,
Types: []extensionswebhook.Type{
{Obj: &appsv1.Deployment{}},
{Obj: &vpaautoscalingv1.VerticalPodAutoscaler{}},
{Obj: &extensionsv1alpha1.OperatingSystemConfig{}},
},
Mutator: genericmutator.NewMutator(mgr, NewEnsurer(mgr, logger), oscutils.NewUnitSerializer(),
kubelet.NewConfigCodec(fciCodec), fciCodec, logger),
})
func AddToManager(gardenerVersion *string) func(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
return func(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
var objectSelector *metav1.LabelSelector
if gardenerVersion != nil && len(*gardenerVersion) > 0 {
version, err := semver.NewVersion(*gardenerVersion)
if err != nil {
return nil, fmt.Errorf("failed to parse gardener version: %v", err)
}
if versionConstraintGreaterEqual198.Check(version) {
objectSelector = &metav1.LabelSelector{MatchLabels: map[string]string{v1beta1constants.LabelExtensionProviderMutatedByControlplaneWebhook: "true"}}
}
}

logger.Info("Adding webhook to manager")
fciCodec := oscutils.NewFileContentInlineCodec()
return controlplane.New(mgr, controlplane.Args{
Kind: controlplane.KindShoot,
Provider: azure.Type,
Types: []extensionswebhook.Type{
{Obj: &appsv1.Deployment{}},
{Obj: &vpaautoscalingv1.VerticalPodAutoscaler{}},
{Obj: &extensionsv1alpha1.OperatingSystemConfig{}},
},
ObjectSelector: objectSelector,
Mutator: genericmutator.NewMutator(mgr, NewEnsurer(mgr, logger), oscutils.NewUnitSerializer(),
kubelet.NewConfigCodec(fciCodec), fciCodec, logger),
})
}
}
Loading