Skip to content

Add subnetName support to ammp #3132

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
merged 1 commit into from
Mar 27, 2023
Merged

Add subnetName support to ammp #3132

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 api/v1alpha3/azuremanagedmachinepool_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
if restored.Spec.KubeletConfig != nil {
dst.Spec.KubeletConfig = restored.Spec.KubeletConfig
}
dst.Spec.SubnetName = restored.Spec.SubnetName

dst.Status.LongRunningOperationStates = restored.Status.LongRunningOperationStates
dst.Status.Conditions = restored.Status.Conditions
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions api/v1alpha4/azuremanagedmachinepool_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func (src *AzureManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
if restored.Spec.KubeletConfig != nil {
dst.Spec.KubeletConfig = restored.Spec.KubeletConfig
}
dst.Spec.SubnetName = restored.Spec.SubnetName

dst.Status.LongRunningOperationStates = restored.Status.LongRunningOperationStates
dst.Status.Conditions = restored.Status.Conditions
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha4/zz_generated.conversion.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: 3 additions & 0 deletions api/v1beta1/azuremanagedmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,9 @@ type AzureManagedMachinePoolSpec struct {
// LinuxOSConfig specifies the custom Linux OS settings and configurations.
// +optional
LinuxOSConfig *LinuxOSConfig `json:"linuxOSConfig,omitempty"`
// SubnetName specifies the Subnet where the MachinePool will be placed
// +optional
SubnetName *string `json:"subnetName,omitempty"`
}

// ManagedMachinePoolScaling specifies scaling options.
Expand Down
20 changes: 20 additions & 0 deletions api/v1beta1/azuremanagedmachinepool_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func (m *AzureManagedMachinePool) ValidateCreate(client client.Client) error {
m.validateEnableNodePublicIP,
m.validateKubeletConfig,
m.validateLinuxOSConfig,
m.validateSubnetName,
}

var errs []error
Expand Down Expand Up @@ -133,6 +134,13 @@ func (m *AzureManagedMachinePool) ValidateUpdate(oldRaw runtime.Object, client c
allErrs = append(allErrs, err)
}

if err := webhookutils.ValidateImmutable(
field.NewPath("Spec", "SubnetName"),
old.Spec.SubnetName,
m.Spec.SubnetName); err != nil && old.Spec.SubnetName != nil {
allErrs = append(allErrs, err)
}

// custom headers are immutable
oldCustomHeaders := maps.FilterByKeyPrefix(old.ObjectMeta.Annotations, CustomHeaderPrefix)
newCustomHeaders := maps.FilterByKeyPrefix(m.ObjectMeta.Annotations, CustomHeaderPrefix)
Expand Down Expand Up @@ -356,6 +364,18 @@ func (m *AzureManagedMachinePool) validateEnableNodePublicIP() error {
return nil
}

func (m *AzureManagedMachinePool) validateSubnetName() error {
if m.Spec.SubnetName != nil {
subnetRegex := "^[a-zA-Z0-9][a-zA-Z0-9-]{0,78}[a-zA-Z0-9]$"
regex := regexp.MustCompile(subnetRegex)
if success := regex.MatchString(pointer.StringDeref(m.Spec.SubnetName, "")); !success {
return field.Invalid(field.NewPath("Spec", "SubnetName"), m.Spec.SubnetName,
fmt.Sprintf("name of subnet doesn't match regex %s", subnetRegex))
}
}
return nil
}

// validateKubeletConfig enforces the AKS API configuration for KubeletConfig.
// See: https://learn.microsoft.com/en-us/azure/aks/custom-node-configuration.
func (m *AzureManagedMachinePool) validateKubeletConfig() error {
Expand Down
148 changes: 148 additions & 0 deletions api/v1beta1/azuremanagedmachinepool_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,48 @@ func TestAzureManagedMachinePoolUpdatingWebhook(t *testing.T) {
},
wantErr: true,
},
{
name: "Can't update SubnetName with error",
new: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet"),
},
},
old: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet-1"),
},
},
wantErr: true,
},
{
name: "Can update SubnetName if subnetName is empty",
new: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet"),
},
},
old: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: nil,
},
},
wantErr: false,
},
{
name: "Can't update SubnetName without error",
new: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet"),
},
},
old: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet"),
},
},
wantErr: false,
},
}
var client client.Client
for _, tc := range tests {
Expand Down Expand Up @@ -593,6 +635,112 @@ func TestAzureManagedMachinePool_ValidateCreate(t *testing.T) {
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("1+subnet"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("1"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("-a_b-c"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("E-a_b-c"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("-_-_"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("abc@#$"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "invalid subnetname with character length 81",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("3DgIb8EZMkLs0KlyPaTcNxoJU9ufmW6jvXrweqz1hVp5nS4RtH2QY7AFOiC5nS4RtH2QY7AFOiC3DgIb8"),
},
},
wantErr: true,
errorLen: 1,
},
{
name: "valid subnetname with character length 80",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("3DgIb8EZMkLs0KlyPaTcNxoJU9ufmW6jvXrweqz1hVp5nS4RtH2QY7AFOiC5nS4RtH2QY7AFOiC3DgIb"),
},
},
wantErr: false,
},
{
name: "valid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("1abc"),
},
},
wantErr: false,
},
{
name: "valid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("1-a-b-c"),
},
},
wantErr: false,
},
{
name: "valid subnetname",
ammp: &AzureManagedMachinePool{
Spec: AzureManagedMachinePoolSpec{
SubnetName: pointer.StringPtr("my-subnet"),
},
},
wantErr: false,
},
{
name: "too few MaxPods",
ammp: &AzureManagedMachinePool{
Expand Down
5 changes: 5 additions & 0 deletions 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.

14 changes: 13 additions & 1 deletion azure/scope/managedmachinepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,23 @@ func (s *ManagedMachinePoolScope) Name() string {
return s.InfraMachinePool.Name
}

// SetSubnetName updates AzureManagedMachinePool.SubnetName if AzureManagedMachinePool.SubnetName is empty with s.ControlPlane.Spec.VirtualNetwork.Subnet.Name.
func (s *ManagedMachinePoolScope) SetSubnetName() {
s.InfraMachinePool.Spec.SubnetName = getAgentPoolSubnet(s.ControlPlane, s.InfraMachinePool)
}

// AgentPoolSpec returns an azure.ResourceSpecGetter for currently reconciled AzureManagedMachinePool.
func (s *ManagedMachinePoolScope) AgentPoolSpec() azure.ResourceSpecGetter {
return buildAgentPoolSpec(s.ControlPlane, s.MachinePool, s.InfraMachinePool, s.AgentPoolAnnotations())
}

func getAgentPoolSubnet(controlPlane *infrav1.AzureManagedControlPlane, infraMachinePool *infrav1.AzureManagedMachinePool) *string {
if infraMachinePool.Spec.SubnetName == nil {
return pointer.StringPtr(controlPlane.Spec.VirtualNetwork.Subnet.Name)
}
return infraMachinePool.Spec.SubnetName
}

func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
machinePool *expv1.MachinePool,
managedMachinePool *infrav1.AzureManagedMachinePool,
Expand Down Expand Up @@ -166,7 +178,7 @@ func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
managedControlPlane.Spec.SubscriptionID,
managedControlPlane.Spec.VirtualNetwork.ResourceGroup,
managedControlPlane.Spec.VirtualNetwork.Name,
managedControlPlane.Spec.VirtualNetwork.Subnet.Name,
pointer.StringDeref(getAgentPoolSubnet(managedControlPlane, managedMachinePool), ""),
),
Mode: managedMachinePool.Spec.Mode,
MaxPods: managedMachinePool.Spec.MaxPods,
Expand Down
Loading