Merge pull request #5738 from rna-afk/nat_gateway_zone_support

Allow users to set the zone for NAT gateway

Author: k8s-ci-robot

api/v1beta1/types.go

@@ -259,6 +259,10 @@ type NatGateway struct {
 	// +optional
 	NatGatewayIP PublicIPSpec `json:"ip,omitempty"`
 
+	// Zones mentions the list of zones the NAT gateway should be a part of.
+	// +optional
+	Zones []string `json:"zones,omitempty"`
+
 	NatGatewayClassSpec `json:",inline"`
 }
 

api/v1beta1/zz_generated.deepcopy.go

@@ -409,6 +409,7 @@ func (s *ClusterScope) NatGatewaySpecs() []azure.ASOResourceSpecGetter[*asonetwo
 					SubscriptionID: s.SubscriptionID(),
 					Location:       s.Location(),
 					ClusterName:    s.ClusterName(),
+					Zones:          subnet.NatGateway.Zones,
 					NatGatewayIP: infrav1.PublicIPSpec{
 						Name: subnet.NatGateway.NatGatewayIP.Name,
 					},

azure/scope/cluster.go

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

azure/services/natgateways/spec.go

@@ -35,6 +35,7 @@ var (
 		ResourceGroup:  "my-rg",
 		SubscriptionID: "123",
 		Location:       "eastus",
+		Zones:          []string{"eastus-1"},
 		NatGatewayIP: infrav1.PublicIPSpec{
 			Name:    "my-natgateway-ip",
 			DNSName: "Standard",
@@ -58,6 +59,7 @@ var (
 			AzureName:            "my-natgateway",
 			IdleTimeoutInMinutes: ptr.To(6),
 			Location:             locationPtr,
+			Zones:                []string{"eastus-1"},
 			Owner: &genruntime.KnownResourceReference{
 				Name: "my-rg",
 			},
@@ -113,6 +115,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))

azure/services/natgateways/spec_test.go

@@ -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
@@ -1003,6 +1009,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