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.

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

[release-1.0] fix outbound lb conversion for v1alpha3 clusters #2191

Merged
merged 1 commit into from
Mar 23, 2022
Merged

[release-1.0] fix outbound lb conversion for v1alpha3 clusters #2191

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
41 changes: 23 additions & 18 deletions api/v1alpha3/azurecluster_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,42 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error { // nolint
dst.Annotations = nil
}
}

// set default control plane outbound lb for private v1alpha3 clusters.
if src.Spec.NetworkSpec.APIServerLB.Type == Internal {
dst.Spec.NetworkSpec.ControlPlaneOutboundLB = &infrav1beta1.LoadBalancerSpec{
FrontendIPsCount: pointer.Int32Ptr(1),
}
// We also need to set the defaults here because "get" won't set defaults, and hence there is no mismatch when a client
// gets a v1alpha3 cluster.
dst.SetControlPlaneOutboundLBDefaults()
}

// set default node plane outbound lb for all v1alpha3 clusters.
dst.Spec.NetworkSpec.NodeOutboundLB = &infrav1beta1.LoadBalancerSpec{
FrontendIPsCount: pointer.Int32Ptr(1),
}
// We also need to set the defaults here because "get" won't set defaults, and hence there is no mismatch when a client
// gets a v1alpha3 cluster.
dst.SetNodeOutboundLBDefaults()

// Manually restore data.
restored := &infrav1beta1.AzureCluster{}
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
return err
}

// override outbound lb if it's present in restored.
dst.Spec.NetworkSpec.ControlPlaneOutboundLB = restored.Spec.NetworkSpec.ControlPlaneOutboundLB
dst.Spec.NetworkSpec.NodeOutboundLB = restored.Spec.NetworkSpec.NodeOutboundLB

dst.Spec.NetworkSpec.PrivateDNSZoneName = restored.Spec.NetworkSpec.PrivateDNSZoneName

dst.Spec.NetworkSpec.APIServerLB.FrontendIPsCount = restored.Spec.NetworkSpec.APIServerLB.FrontendIPsCount
dst.Spec.NetworkSpec.APIServerLB.IdleTimeoutInMinutes = restored.Spec.NetworkSpec.APIServerLB.IdleTimeoutInMinutes
dst.Spec.CloudProviderConfigOverrides = restored.Spec.CloudProviderConfigOverrides
dst.Spec.BastionSpec = restored.Spec.BastionSpec

// set default control plane outbound lb for private v1alpha3 clusters
if src.Spec.NetworkSpec.APIServerLB.Type == Internal && restored.Spec.NetworkSpec.ControlPlaneOutboundLB == nil {
dst.Spec.NetworkSpec.ControlPlaneOutboundLB = &infrav1beta1.LoadBalancerSpec{
FrontendIPsCount: pointer.Int32Ptr(1),
}
} else {
dst.Spec.NetworkSpec.ControlPlaneOutboundLB = restored.Spec.NetworkSpec.ControlPlaneOutboundLB
}

// set default node plane outbound lb for all v1alpha3 clusters
if restored.Spec.NetworkSpec.NodeOutboundLB == nil {
dst.Spec.NetworkSpec.NodeOutboundLB = &infrav1beta1.LoadBalancerSpec{
FrontendIPsCount: pointer.Int32Ptr(1),
}
} else {
dst.Spec.NetworkSpec.NodeOutboundLB = restored.Spec.NetworkSpec.NodeOutboundLB
}

// Here we manually restore outbound security rules. Since v1alpha3 only supports ingress ("Inbound") rules, all v1alpha4/v1beta1 outbound rules are dropped when an AzureCluster
// is converted to v1alpha3. We loop through all security group rules. For all previously existing outbound rules we restore the full rule.
for _, restoredSubnet := range restored.Spec.NetworkSpec.Subnets {
Expand Down
10 changes: 6 additions & 4 deletions api/v1beta1/azurecluster_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func (c *AzureCluster) setNetworkSpecDefaults() {
c.setSubnetDefaults()
c.setVnetPeeringDefaults()
c.setAPIServerLBDefaults()
c.setNodeOutboundLBDefaults()
c.setControlPlaneOutboundLBDefaults()
c.SetNodeOutboundLBDefaults()
c.SetControlPlaneOutboundLBDefaults()
}

func (c *AzureCluster) setResourceGroupDefault() {
Expand Down Expand Up @@ -205,7 +205,8 @@ func (c *AzureCluster) setAPIServerLBDefaults() {
}
}

func (c *AzureCluster) setNodeOutboundLBDefaults() {
// SetNodeOutboundLBDefaults sets the node outbound lb defaults.
func (c *AzureCluster) SetNodeOutboundLBDefaults() {
if c.Spec.NetworkSpec.NodeOutboundLB == nil {
if c.Spec.NetworkSpec.APIServerLB.Type == Internal {
return
Expand Down Expand Up @@ -245,7 +246,8 @@ func (c *AzureCluster) setNodeOutboundLBDefaults() {
c.setOutboundLBFrontendIPs(lb, generateNodeOutboundIPName)
}

func (c *AzureCluster) setControlPlaneOutboundLBDefaults() {
// SetControlPlaneOutboundLBDefaults sets the control plane outbound lb defaults.
func (c *AzureCluster) SetControlPlaneOutboundLBDefaults() {
// public clusters don't need control plane outbound lb
if c.Spec.NetworkSpec.APIServerLB.Type == Public {
return
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/azurecluster_default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
tc := c
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
tc.cluster.setNodeOutboundLBDefaults()
tc.cluster.SetNodeOutboundLBDefaults()
if !reflect.DeepEqual(tc.cluster, tc.output) {
expected, _ := json.MarshalIndent(tc.output, "", "\t")
actual, _ := json.MarshalIndent(tc.cluster, "", "\t")
Expand Down Expand Up @@ -1508,7 +1508,7 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
tc := c
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
tc.cluster.setControlPlaneOutboundLBDefaults()
tc.cluster.SetControlPlaneOutboundLBDefaults()
if !reflect.DeepEqual(tc.cluster, tc.output) {
expected, _ := json.MarshalIndent(tc.output, "", "\t")
actual, _ := json.MarshalIndent(tc.cluster, "", "\t")
Expand Down