Allow users to set the zones for NAT gateway

Allow users to set the zones they need the created
NAT gateway to use. ASO allows the NAT gateway to
be set to a list of zones so enabling that here.

Author: rna-afk

api/v1beta1/types.go

@@ -259,6 +259,10 @@ type NatGateway struct {
 // NatGatewayClassSpec defines a NAT gateway class specification.
 type NatGatewayClassSpec struct {
 	Name string `json:"name"`
+
+	// Zones mentions the list of zones the NAT gateway should be a part of.
+	// +optional
+	Zones []string `json:"zones"`
 }
 
 // SecurityGroupProtocol defines the protocol type for a security group rule.

azure/scope/cluster.go

@@ -412,6 +412,7 @@ func (s *ClusterScope) NatGatewaySpecs() []azure.ASOResourceSpecGetter[*asonetwo
 					NatGatewayIP: infrav1.PublicIPSpec{
 						Name: subnet.NatGateway.NatGatewayIP.Name,
 					},
+					Zones:          subnet.NatGateway.Zones,
 					AdditionalTags: s.AdditionalTags(),
 					// We need to know if the VNet is managed to decide if this NAT Gateway was-managed or not.
 					IsVnetManaged: s.IsVnetManaged(),

azure/services/natgateways/spec.go

@@ -36,6 +36,7 @@ type NatGatewaySpec struct {
 	Location       string
 	NatGatewayIP   infrav1.PublicIPSpec
 	ClusterName    string
+	Zones          []string
 	AdditionalTags infrav1.Tags
 	IsVnetManaged  bool
 }
@@ -79,6 +80,9 @@ func (s *NatGatewaySpec) Parameters(_ context.Context, existingNatGateway *asone
 		Name:        ptr.To(s.Name),
 		Additional:  s.AdditionalTags,
 	})
+	if len(s.Zones) != 0 {
+		natGateway.Spec.Zones = s.Zones
+	}
 
 	return natGateway, nil
 }

azure/services/natgateways/spec_test.go

@@ -36,6 +36,7 @@ var (
 		ResourceGroup:  "my-rg",
 		SubscriptionID: "123",
 		Location:       "eastus",
+		Zones:          []string{"eastus-1"},
 		NatGatewayIP: infrav1.PublicIPSpec{
 			Name:    "my-natgateway-ip",
 			DNSName: "Standard",
@@ -59,6 +60,7 @@ var (
 			AzureName:            "my-natgateway",
 			IdleTimeoutInMinutes: ptr.To(6),
 			Location:             locationPtr,
+			Zones:                []string{"eastus-1"},
 			Owner: &genruntime.KnownResourceReference{
 				Name: "my-rg",
 			},
@@ -114,6 +116,8 @@ func TestParameters(t *testing.T) {
 				g.Expect(parameters.Spec.Owner.Name).To(Equal("my-rg"))
 				g.Expect(parameters.Spec.Location).NotTo(BeNil())
 				g.Expect(parameters.Spec.Location).To(Equal(locationPtr))
+				g.Expect(parameters.Spec.Zones).To(HaveLen(1))
+				g.Expect(parameters.Spec.Zones[0]).To(Equal("eastus-1"))
 				g.Expect(parameters.Spec.Sku.Name).NotTo(BeNil())
 				g.Expect(parameters.Spec.Sku.Name).To(Equal(standardSKUPtr))
 				g.Expect(parameters.Spec.PublicIpAddresses).To(HaveLen(1))

config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml

@@ -215,6 +215,12 @@ spec:
                                 type: object
                               name:
                                 type: string
+                              zones:
+                                description: Zones mentions the list of zones
+                                  the NAT gateway should be a part of.
+                                items:
+                                  type: string
+                                type: array 
                             required:
                             - name
                             type: object
@@ -995,6 +1001,12 @@ spec:
                               type: object
                             name:
                               type: string
+                            zones:
+                              description: Zones mentions the list of zones
+                                the NAT gateway should be a part of.
+                              items:
+                                type: string
+                              type: array 
                           required:
                           - name
                           type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml

@@ -106,6 +106,12 @@ spec:
                                     properties:
                                       name:
                                         type: string
+                                      zones:
+                                        description: Zones mentions the list of zones
+                                          the NAT gateway should be a part of.
+                                        items:
+                                          type: string
+                                        type: array 
                                     required:
                                     - name
                                     type: object
@@ -625,6 +631,12 @@ spec:
                                   properties:
                                     name:
                                       type: string
+                                    zones:
+                                      description: Zones mentions the list of zones
+                                        the NAT gateway should be a part of.
+                                      items:
+                                        type: string
+                                      type: array 
                                   required:
                                   - name
                                   type: object