Skip to content

[release-1.11] 🐛 Export ExtensionConfig webhook #12599

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.

Sign up for GitHub

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

Merged
k8s-ci-robot merged 1 commit into from
Aug 8, 2025
Merged

[release-1.11] 🐛 Export ExtensionConfig webhook #12599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions internal/test/envtest/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ import (
expapiwebhooks "sigs.k8s.io/cluster-api/exp/webhooks"
"sigs.k8s.io/cluster-api/feature"
internalwebhooks "sigs.k8s.io/cluster-api/internal/webhooks"
runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime"
"sigs.k8s.io/cluster-api/util/kubeconfig"
"sigs.k8s.io/cluster-api/util/test/builder"
"sigs.k8s.io/cluster-api/version"
Expand Down Expand Up @@ -390,7 +389,7 @@ func newEnvironment(scheme *runtime.Scheme, additionalCRDDirectoryPaths []string
if err := (&expapiwebhooks.MachinePool{}).SetupWebhookWithManager(mgr); err != nil {
klog.Fatalf("unable to create webhook for machinepool: %+v", err)
}
if err := (&runtimewebhooks.ExtensionConfig{}).SetupWebhookWithManager(mgr); err != nil {
if err := (&webhooks.ExtensionConfig{}).SetupWebhookWithManager(mgr); err != nil {
klog.Fatalf("unable to create webhook for extensionconfig: %+v", err)
}
if err := (&expipamwebhooks.IPAddress{}).SetupWebhookWithManager(mgr); err != nil {
Expand Down
3 changes: 1 addition & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ import (
"sigs.k8s.io/cluster-api/internal/contract"
internalruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client"
runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry"
runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime"
"sigs.k8s.io/cluster-api/util/apiwarnings"
"sigs.k8s.io/cluster-api/util/flags"
"sigs.k8s.io/cluster-api/version"
Expand Down Expand Up @@ -833,7 +832,7 @@ func setupWebhooks(ctx context.Context, mgr ctrl.Manager, clusterCacheReader web

// NOTE: ExtensionConfig is behind the RuntimeSDK feature gate flag. The webhook will prevent creating or updating
// new objects if the feature flag is disabled.
if err := (&runtimewebhooks.ExtensionConfig{}).SetupWebhookWithManager(mgr); err != nil {
if err := (&webhooks.ExtensionConfig{}).SetupWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "Unable to create webhook", "webhook", "ExtensionConfig")
os.Exit(1)
}
Expand Down
9 changes: 9 additions & 0 deletions webhooks/alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
"sigs.k8s.io/cluster-api/internal/webhooks"
runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime"
)

// Cluster implements a validating and defaulting webhook for Cluster.
Expand Down Expand Up @@ -125,3 +126,11 @@ type ClusterResourceSetBinding struct{}
func (webhook *ClusterResourceSetBinding) SetupWebhookWithManager(mgr ctrl.Manager) error {
return (&webhooks.ClusterResourceSetBinding{}).SetupWebhookWithManager(mgr)
}

// ExtensionConfig implements a defaulting and validating webhook for ExtensionConfig.
type ExtensionConfig struct{}

// SetupWebhookWithManager sets up ClusterResourceSet webhooks.
func (webhook *ExtensionConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {
return (&runtimewebhooks.ExtensionConfig{}).SetupWebhookWithManager(mgr)
}