Skip to content

Move webhooks out of exp/api/v1beta1 #6280

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
May 6, 2026
Merged

Move webhooks out of exp/api/v1beta1 #6280

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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
paths=./api/... \
paths=./$(EXP_DIR)/api/... \
paths=./internal/webhooks/... \
paths=./internal/exp/webhooks/... \
crd:crdVersions=v1 \
rbac:roleName=base-manager-role \
output:crd:dir=$(CRD_ROOT) \
Expand Down
3 changes: 2 additions & 1 deletion exp/api/v1beta1/azuremachinepool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
expwebhooks "sigs.k8s.io/cluster-api-provider-azure/internal/exp/webhooks"
)

func TestAzureMachinePool_Validate(t *testing.T) {
Expand Down Expand Up @@ -249,7 +250,7 @@ func TestAzureMachinePool_Validate(t *testing.T) {
// Don't add t.Parallel() here or the test will fail.
g := gomega.NewGomegaWithT(t)
amp := c.Factory(g)
actualErr := amp.Validate(nil, nil)
actualErr := expwebhooks.ValidateAzureMachinePool(nil, amp, nil)
c.Expect(g, actualErr)
})
}
Expand Down
2 changes: 1 addition & 1 deletion exp/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion exp/controllers/azuremachinepool_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"sigs.k8s.io/cluster-api-provider-azure/azure/services/roleassignments"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/scalesets"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/tags"
apiinternalexp "sigs.k8s.io/cluster-api-provider-azure/internal/exp/api/v1beta1"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down Expand Up @@ -73,7 +74,7 @@ func (s *azureMachinePoolService) Reconcile(ctx context.Context) error {
defer done()

// Ensure that the deprecated networking field values have been migrated to the new NetworkInterfaces field.
s.scope.AzureMachinePool.SetNetworkInterfacesDefaults()
apiinternalexp.SetNetworkInterfacesDefaults(s.scope.AzureMachinePool)

if err := s.scope.SetSubnetName(); err != nil {
return errors.Wrap(err, "failed defaulting subnet name")
Expand Down
51 changes: 26 additions & 25 deletions exp/api/v1beta1/azuremachinepool_default.go → ...p/api/v1beta1/azuremachinepool_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021 The Kubernetes Authors.
Copyright The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -27,30 +27,31 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
apiinternal "sigs.k8s.io/cluster-api-provider-azure/internal/api/v1beta1"
azureutil "sigs.k8s.io/cluster-api-provider-azure/util/azure"
utilSSH "sigs.k8s.io/cluster-api-provider-azure/util/ssh"
)

// SetDefaults sets the default values for an AzureMachinePool.
func (amp *AzureMachinePool) SetDefaults(client client.Client) error {
func SetDefaults(amp *infrav1exp.AzureMachinePool, c client.Client) error {
var errs []error
if err := amp.SetDefaultSSHPublicKey(); err != nil {
if err := SetDefaultSSHPublicKey(amp); err != nil {
errs = append(errs, errors.Wrap(err, "failed to set default SSH public key"))
}

if err := amp.SetIdentityDefaults(client); err != nil {
if err := SetIdentityDefaults(amp, c); err != nil {
errs = append(errs, errors.Wrap(err, "failed to set default managed identity defaults"))
}
amp.SetDiagnosticsDefaults()
amp.SetNetworkInterfacesDefaults()
amp.SetOSDiskDefaults()
SetDiagnosticsDefaults(amp)
SetNetworkInterfacesDefaults(amp)
SetOSDiskDefaults(amp)

return kerrors.NewAggregate(errs)
}

// SetDefaultSSHPublicKey sets the default SSHPublicKey for an AzureMachinePool.
func (amp *AzureMachinePool) SetDefaultSSHPublicKey() error {
func SetDefaultSSHPublicKey(amp *infrav1exp.AzureMachinePool) error {
if sshKeyData := amp.Spec.Template.SSHPublicKey; sshKeyData == "" {
_, publicRsaKey, err := utilSSH.GenerateSSHKey()
if err != nil {
Expand All @@ -63,35 +64,35 @@ func (amp *AzureMachinePool) SetDefaultSSHPublicKey() error {
}

// SetIdentityDefaults sets the defaults for VMSS Identity.
func (amp *AzureMachinePool) SetIdentityDefaults(client client.Client) error {
func SetIdentityDefaults(amp *infrav1exp.AzureMachinePool, c client.Client) error {
// Ensure the deprecated fields and new fields are not populated simultaneously
if amp.Spec.RoleAssignmentName != "" && amp.Spec.SystemAssignedIdentityRole != nil && amp.Spec.SystemAssignedIdentityRole.Name != "" {
if amp.Spec.RoleAssignmentName != "" && amp.Spec.SystemAssignedIdentityRole != nil && amp.Spec.SystemAssignedIdentityRole.Name != "" { //nolint:staticcheck
// Both the deprecated and the new fields are both set, return without changes
// and reject the request in the validating webhook which runs later.
return nil
}
if amp.Spec.Identity == infrav1.VMIdentitySystemAssigned {
machinePool, err := azureutil.FindParentMachinePoolWithRetryV1Beta1(amp.Name, client, 5)
machinePool, err := azureutil.FindParentMachinePoolWithRetryV1Beta1(amp.Name, c, 5)
if err != nil {
return errors.Wrap(err, "failed to find parent machine pool")
}

ownerAzureClusterName, ownerAzureClusterNamespace, err := apiinternal.GetOwnerAzureClusterNameAndNamespace(client, machinePool.Spec.ClusterName, machinePool.Namespace, 5)
ownerAzureClusterName, ownerAzureClusterNamespace, err := apiinternal.GetOwnerAzureClusterNameAndNamespace(c, machinePool.Spec.ClusterName, machinePool.Namespace, 5)
if err != nil {
return errors.Wrap(err, "failed to get owner cluster")
}

subscriptionID, err := apiinternal.GetSubscriptionID(client, ownerAzureClusterName, ownerAzureClusterNamespace, 5)
subscriptionID, err := apiinternal.GetSubscriptionID(c, ownerAzureClusterName, ownerAzureClusterNamespace, 5)
if err != nil {
return errors.Wrap(err, "failed to get subscription ID")
}

if amp.Spec.SystemAssignedIdentityRole == nil {
amp.Spec.SystemAssignedIdentityRole = &infrav1.SystemAssignedIdentityRole{}
}
if amp.Spec.RoleAssignmentName != "" {
amp.Spec.SystemAssignedIdentityRole.Name = amp.Spec.RoleAssignmentName
amp.Spec.RoleAssignmentName = ""
if amp.Spec.RoleAssignmentName != "" { //nolint:staticcheck
amp.Spec.SystemAssignedIdentityRole.Name = amp.Spec.RoleAssignmentName //nolint:staticcheck
amp.Spec.RoleAssignmentName = "" //nolint:staticcheck
} else if amp.Spec.SystemAssignedIdentityRole.Name == "" {
amp.Spec.SystemAssignedIdentityRole.Name = string(uuid.NewUUID())
}
Expand All @@ -108,7 +109,7 @@ func (amp *AzureMachinePool) SetIdentityDefaults(client client.Client) error {
}

// SetSpotEvictionPolicyDefaults sets the defaults for the spot VM eviction policy.
func (amp *AzureMachinePool) SetSpotEvictionPolicyDefaults() {
func SetSpotEvictionPolicyDefaults(amp *infrav1exp.AzureMachinePool) {
if amp.Spec.Template.SpotVMOptions != nil && amp.Spec.Template.SpotVMOptions.EvictionPolicy == nil {
defaultPolicy := infrav1.SpotEvictionPolicyDeallocate
if amp.Spec.Template.OSDisk.DiffDiskSettings != nil && amp.Spec.Template.OSDisk.DiffDiskSettings.Option == "Local" {
Expand All @@ -119,7 +120,7 @@ func (amp *AzureMachinePool) SetSpotEvictionPolicyDefaults() {
}

// SetDiagnosticsDefaults sets the defaults for Diagnostic settings for an AzureMachinePool.
func (amp *AzureMachinePool) SetDiagnosticsDefaults() {
func SetDiagnosticsDefaults(amp *infrav1exp.AzureMachinePool) {
bootDefault := &infrav1.BootDiagnostics{
StorageAccountType: infrav1.ManagedDiagnosticsStorage,
}
Expand All @@ -136,9 +137,9 @@ func (amp *AzureMachinePool) SetDiagnosticsDefaults() {
}

// SetNetworkInterfacesDefaults sets the defaults for the network interfaces.
func (amp *AzureMachinePool) SetNetworkInterfacesDefaults() {
func SetNetworkInterfacesDefaults(amp *infrav1exp.AzureMachinePool) {
// Ensure the deprecated fields and new fields are not populated simultaneously
if (amp.Spec.Template.SubnetName != "" || amp.Spec.Template.AcceleratedNetworking != nil) && len(amp.Spec.Template.NetworkInterfaces) > 0 {
if (amp.Spec.Template.SubnetName != "" || amp.Spec.Template.AcceleratedNetworking != nil) && len(amp.Spec.Template.NetworkInterfaces) > 0 { //nolint:staticcheck
// Both the deprecated and the new fields are both set, return without changes
// and reject the request in the validating webhook which runs later.
return
Expand All @@ -147,12 +148,12 @@ func (amp *AzureMachinePool) SetNetworkInterfacesDefaults() {
if len(amp.Spec.Template.NetworkInterfaces) == 0 {
amp.Spec.Template.NetworkInterfaces = []infrav1.NetworkInterface{
{
SubnetName: amp.Spec.Template.SubnetName,
AcceleratedNetworking: amp.Spec.Template.AcceleratedNetworking,
SubnetName: amp.Spec.Template.SubnetName, //nolint:staticcheck
AcceleratedNetworking: amp.Spec.Template.AcceleratedNetworking, //nolint:staticcheck
},
}
amp.Spec.Template.SubnetName = ""
amp.Spec.Template.AcceleratedNetworking = nil
amp.Spec.Template.SubnetName = "" //nolint:staticcheck
amp.Spec.Template.AcceleratedNetworking = nil //nolint:staticcheck
}

// Ensure that PrivateIPConfigs defaults to 1 if not specified.
Expand All @@ -164,7 +165,7 @@ func (amp *AzureMachinePool) SetNetworkInterfacesDefaults() {
}

// SetOSDiskDefaults sets the defaults for the OSDisk.
func (amp *AzureMachinePool) SetOSDiskDefaults() {
func SetOSDiskDefaults(amp *infrav1exp.AzureMachinePool) {
if amp.Spec.Template.OSDisk.OSType == "" {
amp.Spec.Template.OSDisk.OSType = "Linux"
}
Expand Down
Loading
Loading